Merge "Fix some issues with new version module"

bin/keystone-control

@@ -42,7 +42,7 @@ if os.path.exists(os.path.join(possible_topdir, 'keystone', '__init__.py')):
 
 gettext.install('keystone', unicode=1)
 
-import keystone
+import keystone.version
 from keystone.common import config
 
 ALL_COMMANDS = ['start', 'stop', 'shutdown', 'restart',
@@ -179,7 +179,7 @@ def do_stop(server, options, args, graceful=False):
 
 if __name__ == '__main__':
     oparser = optparse.OptionParser(usage=USAGE, version='%%prog %s'
-                                    % keystone.version())
+                                    % keystone.version.version())
     oparser.add_option('--pid-file', default=None, metavar="PATH",
                        help="File to use as pid file. Default: "
                        "/var/run/keystone/$server.pid")

doc/source/setup.rst

@@ -103,12 +103,12 @@ the easiest of which is::
 You should then be able to `import keystone` from your Python shell
 without issue::
 
-    >>> import keystone
+    >>> import keystone.version
     >>>
 
 If you want to check the version of Keystone you are running:
 
-    >>> print keystone.version()
+    >>> print keystone.version.version()
     2012.1-dev
 
 

keystone/test/__init__.py

@@ -65,6 +65,7 @@
 from functional.common import HttpTestCase
 import keystone
 import keystone.server
+import keystone.version
 from keystone.common import config, wsgi
 from keystone import backends
 
@@ -386,7 +387,8 @@ def setUp(self):
         # run the keystone server
         print "Starting the keystone server..."
 
-        parser = optparse.OptionParser(version='%%prog %s' % keystone.version)
+        parser = optparse.OptionParser(version='%%prog %s' %
+                                       keystone.version.version())
         common_group = config.add_common_options(parser)
         config.add_log_options(parser)