Merge pull request #1852 from dongweiming/modify_setup

modify setup.py

setup.py

@@ -111,8 +111,7 @@ def add_doc(m):
         re_vers: add_version,
         re_doc: add_doc}
 here = os.path.abspath(os.path.dirname(__file__))
-meta_fh = open(os.path.join(here, 'celery/__init__.py'))
-try:
+with open(os.path.join(here, 'celery/__init__.py')) as meta_fh:
     meta = {}
     for line in meta_fh:
         if line.strip() == '# -eof meta-':
@@ -121,8 +120,6 @@ def add_doc(m):
             m = pattern.match(line.strip())
             if m:
                 meta.update(handler(m))
-finally:
-    meta_fh.close()
 
 # -*- Installation Requires -*-
 
@@ -170,30 +167,13 @@ def reqs(*f):
 
 if is_setuptools:
     extras = lambda *p: reqs('extras', *p)
-    extra['extras_require'] = {
-        # Celery specific
-        'auth': extras('auth.txt'),
-        'cassandra': extras('cassandra.txt'),
-        'memcache': extras('memcache.txt'),
-        'couchbase': extras('couchbase.txt'),
-        'threads': extras('threads.txt'),
-        'eventlet': extras('eventlet.txt'),
-        'gevent': extras('gevent.txt'),
-
-        'msgpack': extras('msgpack.txt'),
-        'yaml': extras('yaml.txt'),
-        'redis': extras('redis.txt'),
-        'mongodb': extras('mongodb.txt'),
-        'sqs': extras('sqs.txt'),
-        'couchdb': extras('couchdb.txt'),
-        'beanstalk': extras('beanstalk.txt'),
-        'zookeeper': extras('zookeeper.txt'),
-        'zeromq': extras('zeromq.txt'),
-        'sqlalchemy': extras('sqlalchemy.txt'),
-        'librabbitmq': extras('librabbitmq.txt'),
-        'pyro': extras('pyro.txt'),
-        'slmq': extras('slmq.txt'),
-    }
+    # Celery specific
+    specific_list = ['auth', 'cassandra', 'memcache', 'couchbase', 'threads',
+                     'eventlet', 'gevent', 'msgpack', 'yaml', 'redis',
+                     'mongodb', 'sqs', 'couchdb', 'beanstalk', 'zookeeper',
+                     'zeromq', 'sqlalchemy', 'librabbitmq', 'pyro', 'slmq']
+    extras_require = dict((x, extras(x + '.txt')) for x in specific_list)
+    extra['extras_require'] = extras_require
 
 # -*- %%% -*-