Rev 3861: (mbp, for jam) version_info code cleanup in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3861
revision-id: pqm at pqm.ubuntu.com-20081127052415-9hb2n5pppt7imsb3
parent: pqm at pqm.ubuntu.com-20081127031840-o1i61l3vf2yin615
parent: john at arbash-meinel.com-20081125170254-bxb31xj93ym5vdun
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-11-27 05:24:15 +0000
message:
  (mbp, for jam) version_info code cleanup
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3849.2.1
    revision-id: john at arbash-meinel.com-20081125170254-bxb31xj93ym5vdun
    parent: pqm at pqm.ubuntu.com-20081125152232-c22rycit2dfzm11f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2008-11-25 11:02:54 -0600
    message:
      Cleanup variable names inside a function.
    modified:
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-11-26 16:54:33 +0000
+++ b/bzrlib/__init__.py	2008-11-27 05:24:15 +0000
@@ -86,23 +86,23 @@
     if len(version_info) <= 3:
         return main_version
 
-    __release_type = version_info[3]
-    __sub = version_info[4]
+    release_type = version_info[3]
+    sub = version_info[4]
 
     # check they're consistent
-    if __release_type == 'final' and __sub == 0:
-        __sub_string = ''
-    elif __release_type == 'dev' and __sub == 0:
-        __sub_string = 'dev'
-    elif __release_type in ('alpha', 'beta'):
-        __sub_string = __release_type[0] + str(__sub)
-    elif __release_type == 'candidate':
-        __sub_string = 'rc' + str(__sub)
+    if release_type == 'final' and sub == 0:
+        sub_string = ''
+    elif release_type == 'dev' and sub == 0:
+        sub_string = 'dev'
+    elif release_type in ('alpha', 'beta'):
+        sub_string = release_type[0] + str(sub)
+    elif release_type == 'candidate':
+        sub_string = 'rc' + str(sub)
     else:
         raise ValueError("version_info %r not valid" % (version_info,))
 
     version_string = '%d.%d.%d.%s.%d' % version_info
-    return main_version + __sub_string
+    return main_version + sub_string
 
 __version__ = _format_version_tuple(version_info)
 version_string = __version__