Revert the celery.distmeta change, just use celery/__init__.py

celery/__init__.py

@@ -1,4 +1,20 @@
 """Distributed Task Queue"""
-from celery.distmeta import (__version__, __author__, __contact__,
-                             __homepage__, __docformat__, VERSION,
-                             is_stable_release, version_with_meta)
+
+VERSION = (0, 9, 0)
+
+__version__ = ".".join(map(str, VERSION))
+__author__ = "Ask Solem"
+__contact__ = "askh@opera.com"
+__homepage__ = "http://github.com/ask/celery/"
+__docformat__ = "restructuredtext"
+
+
+def is_stable_release():
+    return bool(not VERSION[1] % 2)
+
+
+def version_with_meta():
+    meta = "unstable"
+    if is_stable_release():
+        meta = "stable"
+    return "%s (%s)" % (__version__, meta)

celery/distmeta.py

@@ -1,20 +0,0 @@
-"""Distributed Task Queue"""
-
-VERSION = (0, 9, 0)
-
-__version__ = ".".join(map(str, VERSION))
-__author__ = "Ask Solem"
-__contact__ = "askh@opera.com"
-__homepage__ = "http://github.com/ask/celery/"
-__docformat__ = "restructuredtext"
-
-
-def is_stable_release():
-    return bool(not VERSION[1] % 2)
-
-
-def version_with_meta():
-    meta = "unstable"
-    if is_stable_release():
-        meta = "stable"
-    return "%s (%s)" % (__version__, meta)

celery/tests/test_celery.py

@@ -1,5 +1,5 @@
 import unittest
-import celery.distmeta as celery
+import celery
 
 
 class TestInitFile(unittest.TestCase):

setup.py

@@ -12,7 +12,7 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages, Command
 
-from celery import distmeta
+import celery as distmeta
 
 
 class RunTests(Command):