Merge setup-args-5146

Author: zseil Reviewer: jesstess Fixes: twisted#5146 Fix the indentation level of the setup_args dictionary in Twisted's top level setup.py so it isn't erroneously created several times. git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@32223 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
dansut · Jul 5, 2011 · 3c158bc · 3c158bc
1 parent 02d4543
commit 3c158bc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def getExtensions():
                 execfile(setup_py, ns, ns)
                 if "extensions" in ns:
                     extensions.extend(ns["extensions"])
-                    
+
     return extensions
 
 
@@ -55,32 +55,31 @@ def main(args):
     for i in projects:
         scripts.extend(getScripts(i))
 
-        setup_args = dict(
-            # metadata
-            name="Twisted",
-            version=copyright.version,
-            description="An asynchronous networking framework written in "
-                        "Python",
-            author="Twisted Matrix Laboratories",
-            author_email="twisted-python@twistedmatrix.com",
-            maintainer="Glyph Lefkowitz",
-            maintainer_email="glyph@twistedmatrix.com",
-            url="http://twistedmatrix.com/",
-            license="MIT",
-            long_description="""\
+    setup_args = dict(
+        # metadata
+        name="Twisted",
+        version=copyright.version,
+        description="An asynchronous networking framework written in Python",
+        author="Twisted Matrix Laboratories",
+        author_email="twisted-python@twistedmatrix.com",
+        maintainer="Glyph Lefkowitz",
+        maintainer_email="glyph@twistedmatrix.com",
+        url="http://twistedmatrix.com/",
+        license="MIT",
+        long_description="""\
 An extensible framework for Python programming, with special focus
 on event-based network programming and multiprotocol integration.
 """,
-            packages = getPackages('twisted'),
-            conditionalExtensions = getExtensions(),
-            scripts = scripts,
-            data_files=getDataFiles('twisted'),
-            classifiers=[
-                "Programming Language :: Python :: 2.4",
-                "Programming Language :: Python :: 2.5",
-                "Programming Language :: Python :: 2.6",
-                "Programming Language :: Python :: 2.7",
-                ])
+        packages = getPackages('twisted'),
+        conditionalExtensions = getExtensions(),
+        scripts = scripts,
+        data_files=getDataFiles('twisted'),
+        classifiers=[
+            "Programming Language :: Python :: 2.4",
+            "Programming Language :: Python :: 2.5",
+            "Programming Language :: Python :: 2.6",
+            "Programming Language :: Python :: 2.7",
+            ])
 
     if 'setuptools' in sys.modules:
         from pkg_resources import parse_requirements

diff --git a/twisted/topfiles/5146.misc b/twisted/topfiles/5146.misc