* Fix tuple bug for version

diff --git a/setup.py b/setup.py
index fac8a6db33563e47fb90b0f3c7e78d29341f11f3..bc5b867a56689871ac6a8d0b057e31c070c2c010 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -41,11 +41,7 @@ for dirpath, dirnames, filenames in os.walk(telemeta_dir):
         data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
 
 # Dynamically calculate the version based on telemeta.VERSION.
-version_tuple = __import__('telemeta').__version__
-if version_tuple[2] is not None:
-    version = "%d.%d_%s" % version_tuple
-else:
-    version = "%d.%d" % version_tuple[:2]
+version = __import__('telemeta').__version__
 
 setup(
   name = "telemeta",
@@ -53,7 +49,7 @@ setup(
   description = "web frontend to backup, transcode and tag any audio content with metadata",
   author = ["Guillaume Pellerin, Olivier Guilyardi"],
   author_email = ["pellerin@parisson.com"],
-  version = "0.3.1",
+  version = version,
   packages = packages,
   data_files = data_files,
   long_description = """

diff --git a/telemeta/__init__.py b/telemeta/__init__.py
index deee127aa8f231186d4c38471347b09215e2f5a0..bf349fc41be6f06e7dd1068b8d513fa1d316eb40 100644 (file)
--- a/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@ -11,7 +11,7 @@ U{http://svn.parisson.org/telemeta}
 """
 
 __docformat__ = 'epytext en'
-__version__ = (0, 3, 1)
+__version__ = '0.3.1'
 __url__ = 'http://svn.parisson.org/telemeta'
 __copyright__ = '(C) 2007 Parisson'
 __license__ = 'BSD'