remove ImportError hack for __version__

Author: xsleonard

rauth/__about__.py

@@ -0,0 +1,6 @@
+__title__ = 'rauth'
+__version_info__ = ('0', '6', '2')
+__version__ = '.'.join(__version_info__)
+__author__ = 'Max Countryman'
+__license__ = 'MIT'
+__copyright__ = 'Copyright 2013 litl'

rauth/__init__.py

@@ -16,22 +16,13 @@
 
 '''
 
-__title__ = 'rauth'
-__version_info__ = ('0', '6', '2')
-__version__ = '.'.join(__version_info__)
-__author__ = 'Max Countryman'
-__license__ = 'MIT'
-__copyright__ = 'Copyright 2013 litl'
 __all__ = ['OAuth1Service', 'OAuth2Service', 'OflyService', 'OAuth1Session',
            'OAuth2Session', 'OflySession']
 
-# HACK: setup workaround for the need to have Requests at runtime
-try:
-    from .service import OAuth1Service, OAuth2Service, OflyService
-    from .session import OAuth1Session, OAuth2Session, OflySession
+from .service import OAuth1Service, OAuth2Service, OflyService
+from .session import OAuth1Session, OAuth2Session, OflySession
+from .__about__ import (__title__, __version_info__, __version__, __author__,
+                        __license__, __copyright__)
 
-    # placate pyflakes
-    (OAuth1Service, OAuth2Service, OflyService, OAuth1Session, OAuth2Session,
-     OflySession)
-except ImportError:  # pragma: no cover
-    pass
+(__title__, __version_info__, __version__, __author__, __license__,
+ __copyright__)  # silence pep8 "imported but unused"

setup.py

@@ -14,10 +14,12 @@
 import os
 import sys
 
-from rauth import __version__
-
 from setuptools import setup, find_packages
 
+about = {}
+with open('rauth/__about__.py') as f:
+    exec(f.read(), about)
+
 if sys.argv[-1] == 'test':
     status = os.system('make check')
     status >>= 8
@@ -46,16 +48,16 @@
                'Topic :: Software Development :: Libraries :: Python Modules',
                'Topic :: Utilities']
 
-setup(name='rauth',
-      version=__version__,
+setup(name=about['__title__'],
+      version=about['__version__'],
       description='A Python library for OAuth 1.0/a, 2.0, and Ofly.',
       long_description=__doc__,
-      author='Max Countryman',
+      author=about['__author__'],
       author_email='[email protected]',
       url='https://github.com/litl/rauth',
       packages=find_packages(),
       install_requires=install_requires,
-      license='MIT',
+      license=about['__license__'],
       keywords='oauth oauth2 rauth requests',
       classifiers=classifiers,
       zip_safe=False)