Stricter PEP-8 conformance.

diff --git a/setup.py b/setup.py
index a6c07cd25aae80035a55fab7c0f111f9b517522f..f49d72372c0fe02d6cd687f208a57ff6cc458bf7 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,31 +9,38 @@ from distutils.core import setup, Command, Extension
 from distutils.command.clean import clean as distutils_clean
 from distutils.command.sdist import sdist as distutils_sdist
 
 from distutils.command.clean import clean as distutils_clean
 from distutils.command.sdist import sdist as distutils_sdist
 

+

 class clean(distutils_clean):
     def run(self):
         # In addition to what the normal clean run does, remove pyc
         # and pyo and backup files from the source tree.
         distutils_clean.run(self)
 class clean(distutils_clean):
     def run(self):
         # In addition to what the normal clean run does, remove pyc
         # and pyo and backup files from the source tree.
         distutils_clean.run(self)

+

         def should_remove(filename):
         def should_remove(filename):

-            if (filename.lower()[-4:] in [".pyc", ".pyo"] or
-                filename.endswith("~") or
-                (filename.startswith("#") and filename.endswith("#"))):
+            if (filename.lower()[-4:] in [".pyc", ".pyo"]
+                or filename.endswith("~")
+                or (filename.startswith("#")
+                    and filename.endswith("#"))):

                 return True
             else:
                 return False
         for pathname, dirs, files in os.walk(os.path.dirname(__file__)):
             for filename in filter(should_remove, files):
                 return True
             else:
                 return False
         for pathname, dirs, files in os.walk(os.path.dirname(__file__)):
             for filename in filter(should_remove, files):

-                try: os.unlink(os.path.join(pathname, filename))
+                try:
+                    os.unlink(os.path.join(pathname, filename))

                 except EnvironmentError as err:
                     print(str(err))
 
                 except EnvironmentError as err:
                     print(str(err))
 

-        try: os.unlink("MANIFEST")
-        except OSError: pass
+        try:
+            os.unlink("MANIFEST")
+        except OSError:
+            pass

 
         for base in ["coverage", "build", "dist"]:
 
         for base in ["coverage", "build", "dist"]:

-             path = os.path.join(os.path.dirname(__file__), base)
-             if os.path.isdir(path):
-                 shutil.rmtree(path)
+            path = os.path.join(os.path.dirname(__file__), base)
+            if os.path.isdir(path):
+                shutil.rmtree(path)
+

 
 class coverage_cmd(Command):
     description = "generate test coverage data"
 
 class coverage_cmd(Command):
     description = "generate test coverage data"


@@ -41,7 +48,7 @@ class coverage_cmd(Command):
 
     def initialize_options(self):
         pass
 
     def initialize_options(self):
         pass

-    
+

     def finalize_options(self):
         pass
 
     def finalize_options(self):
         pass
 


@@ -50,6 +57,7 @@ class coverage_cmd(Command):
         tracer = trace.Trace(
             count=True, trace=False,
             ignoredirs=[sys.prefix, sys.exec_prefix])
         tracer = trace.Trace(
             count=True, trace=False,
             ignoredirs=[sys.prefix, sys.exec_prefix])

+

         def run_tests():
             import bulletml
             try:
         def run_tests():
             import bulletml
             try:


@@ -57,13 +65,16 @@ class coverage_cmd(Command):
             except NameError:
                 pass
             self.run_command("test")
             except NameError:
                 pass
             self.run_command("test")

+

         tracer.runfunc(run_tests)
         results = tracer.results()
         coverage = os.path.join(os.path.dirname(__file__), "coverage")
         results.write_results(show_missing=True, coverdir=coverage)
         map(os.unlink, glob.glob(os.path.join(coverage, "[!b]*.cover")))
         tracer.runfunc(run_tests)
         results = tracer.results()
         coverage = os.path.join(os.path.dirname(__file__), "coverage")
         results.write_results(show_missing=True, coverdir=coverage)
         map(os.unlink, glob.glob(os.path.join(coverage, "[!b]*.cover")))

-        try: os.unlink(os.path.join(coverage, "..setup.cover"))
-        except OSError: pass
+        try:
+            os.unlink(os.path.join(coverage, "..setup.cover"))
+        except OSError:
+            pass

 
         total_lines = 0
         bad_lines = 0
 
         total_lines = 0
         bad_lines = 0


@@ -78,16 +89,18 @@ class coverage_cmd(Command):
         print("Coverage data written to %s (%d/%d, %0.2f%%)" % (
             coverage, total_lines - bad_lines, total_lines, pct))
 
         print("Coverage data written to %s (%d/%d, %0.2f%%)" % (
             coverage, total_lines - bad_lines, total_lines, pct))
 

+

 class sdist(distutils_sdist):
     def run(self):
         self.run_command("test")
         distutils_sdist.run(self)
 
 class sdist(distutils_sdist):
     def run(self):
         self.run_command("test")
         distutils_sdist.run(self)
 

+

 class test_cmd(Command):
     description = "run automated tests"
     user_options = [
         ("to-run=", None, "list of tests to run (default all)"),
 class test_cmd(Command):
     description = "run automated tests"
     user_options = [
         ("to-run=", None, "list of tests to run (default all)"),

-        ]
+    ]

 
     def initialize_options(self):
         self.to_run = []
 
     def initialize_options(self):
         self.to_run = []