[mb-commits] r7314 - in libtunepimp/trunk/python: . tunepimp

Author: luks
Date: 2006-04-22 20:15:08 +0000 (Sat, 22 Apr 2006)
New Revision: 7314

Modified:
   libtunepimp/trunk/python/setup.py
   libtunepimp/trunk/python/tunepimp/__init__.py.in
Log:
* Rearranged setup.py to check for __init__.py first and then import it
* Removed unnecessary import of tunepimp.tunepimp in __init__.py

Modified: libtunepimp/trunk/python/setup.py
===================================================================
--- libtunepimp/trunk/python/setup.py   2006-04-22 19:30:40 UTC (rev 7313)
+++ libtunepimp/trunk/python/setup.py   2006-04-22 20:15:08 UTC (rev 7314)
@@ -28,14 +28,15 @@
 
 from distutils.core import setup, Extension
 import os.path
-import tunepimp
 
 if not os.path.exists(os.path.join('tunepimp', '__init__.py')):
        print "ERROR: Please run ../configure before installing this package."
        raise ValueError
 
+from tunepimp import __version__
+
 setup(name="tunepimp",
-      version=tunepimp.__version__,
+      version=__version__,
       description="MusicBrainz TunePimp Extension",
       author="Robert Kaye",
       author_email="rob@xxxxxxxxxx",

Modified: libtunepimp/trunk/python/tunepimp/__init__.py.in
===================================================================
--- libtunepimp/trunk/python/tunepimp/__init__.py.in    2006-04-22 19:30:40 UTC 
(rev 7313)
+++ libtunepimp/trunk/python/tunepimp/__init__.py.in    2006-04-22 20:15:08 UTC 
(rev 7314)
@@ -24,8 +24,7 @@
 #   $Id$
 #
 #---------------------------------------------------------------------------
-import tunepimp
 
 __version__ = '@VERSION@'
-__doc__ = tunepimp.__doc__
-__all__ = ['tunepimp', 'track', 'metadata', 'strconvert']
+__all__ = ['tunepimp', 'track', 'metadata']
+