get rid of the _Version class, up version to 0.14.0

schmir · schmir · commit 18985a8f26be · 2012-07-20T13:02:28.000+02:00
also move mw-version's main to mw-version
diff --git a/mw-version b/mw-version
@@ -1,6 +1,35 @@
 #! /usr/bin/env python
 
-from mwlib._version import main
+def main():
+    from mwlib._version import version, gitversion, gitid
+
+    msg = "mwlib: %s" % (version or gitversion,)
+    if gitid:
+        msg += "(%s)" % gitid
+    print msg
+
+    try:
+        from mwlib.rl import _gitversion
+        print "mwlib.rl", _gitversion.gitversion
+    except ImportError:
+        try:
+            from mwlib.rl._version import version as rlversion
+            print "mwlib.rl:", rlversion
+        except ImportError:
+            pass
+
+    try:
+        from mwlib._extversion import version as extversion
+        print "mwlib.ext:", extversion
+    except ImportError:
+        pass
+
+    try:
+        from mwlib.hiq import _gitversion
+    except ImportError:
+        pass
+    else:
+        print "mwlib.hiq", _gitversion.gitversion
 
 if __name__ == "__main__":
     main()
diff --git a/mwlib/_version.py b/mwlib/_version.py
@@ -1,42 +1,9 @@
-class _Version(tuple):
-    """internal version object, subclass of C{tuple},
-    but implements a fancier __str__ representation
-    """
-    def __str__(self):
-        return '.'.join([str(x) for x in self])
-
-version = _Version((0, 13, 11))
-del _Version
+__version_info__ = (0, 14, 0)
+version = __version__ = "0.14.0"
 
 try:
     from mwlib._gitversion import gitid, gitversion
 except ImportError:
     gitid = gitversion = ""
 
-display_version = gitversion or str(version)
-
-def main():
-    print "mwlib: %s (%s)" % (display_version, gitid)
-    try:
-        from mwlib.rl import _gitversion
-        print "mwlib.rl", _gitversion.gitversion
-    except ImportError:        
-        try:
-            from mwlib.rl._version import version as rlversion
-            print "mwlib.rl:", rlversion
-        except ImportError:
-            pass
-
-    try:
-        from mwlib._extversion import version as extversion
-        print "mwlib.ext:", extversion
-    except ImportError:
-        pass
-
-    try:
-        from mwlib.hiq import _gitversion
-    except ImportError:
-        pass
-    else:
-        print "mwlib.hiq",  _gitversion.gitversion
-        
+display_version = gitversion or version
