Merge "The code using 'python-escalatorclient' as the client's package name. But...

diff --git a/client/doc/source/conf.py b/client/doc/source/conf.py
index 1cfaad2..0e00ed1 100644 (file)
--- a/client/doc/source/conf.py
+++ b/client/doc/source/conf.py
@@ -28,7 +28,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'python-escalatorclient'
+project = 'escalatorclient'
 copyright = u'OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.

diff --git a/client/doc/source/man/escalator.rst b/client/doc/source/man/escalator.rst
index 40536ec..bb90ac1 100644 (file)
--- a/client/doc/source/man/escalator.rst
+++ b/client/doc/source/man/escalator.rst
@@ -84,4 +84,4 @@ BUGS
 ====
 
 escalator client is hosted in Launchpad so you can view current bugs at
-https://bugs.launchpad.net/python-escalatorclient/.
+https://bugs.launchpad.net/escalatorclient/.

diff --git a/client/escalatorclient/__init__.py b/client/escalatorclient/__init__.py
index 4b95f8a..8d43a42 100644 (file)
--- a/client/escalatorclient/__init__.py
+++ b/client/escalatorclient/__init__.py
@@ -23,7 +23,7 @@ except ImportError:
 
 import pbr.version
 
-version_info = pbr.version.VersionInfo('python-escalatorclient')
+version_info = pbr.version.VersionInfo('escalatorclient')
 
 try:
     __version__ = version_info.version_string()

diff --git a/client/escalatorclient/common/http.py b/client/escalatorclient/common/http.py
index 301eedb..36a2157 100644 (file)
--- a/client/escalatorclient/common/http.py
+++ b/client/escalatorclient/common/http.py
@@ -45,7 +45,7 @@ if not hasattr(parse, 'parse_qsl'):
 osprofiler_web = importutils.try_import("osprofiler.web")
 
 LOG = logging.getLogger(__name__)
-USER_AGENT = 'python-escalatorclient'
+USER_AGENT = 'escalatorclient'
 CHUNKSIZE = 1024 * 64  # 64kB
 
 

diff --git a/client/run_tests.sh b/client/run_tests.sh
index 80edda6..ff7d278 100644 (file)
--- a/client/run_tests.sh
+++ b/client/run_tests.sh
@@ -2,7 +2,7 @@
 
 function usage {
   echo "Usage: $0 [OPTION]..."
-  echo "Run python-escalatorclient's test suite(s)"
+  echo "Run escalatorclient's test suite(s)"
   echo ""
   echo "  -p, --pep8               Just run flake8"
   echo "  -h, --help               Print this usage message"