Merge pull request #131 from ShikharJ/PEP8

Formatted .py files according to PEP8 guidelines

Author: isuruf

setup.py

@@ -3,10 +3,13 @@
 import os
 import subprocess
 import sys
+from distutils.command.build_ext import build_ext as _build_ext
+from distutils.command.build import build as _build
 
 # Make sure the system has the right Python version.
 if sys.version_info[:2] < (2, 7):
-    print("SymEngine requires Python 2.7 or newer. Python %d.%d detected" % sys.version_info[:2])
+    print("SymEngine requires Python 2.7 or newer. "
+          "Python %d.%d detected" % sys.version_info[:2])
     sys.exit(-1)
 
 # use setuptools by default as per the official advice at:
@@ -18,12 +21,9 @@
     if use_distutils.lower() == 'true':
         use_setuptools = False
     else:
-        print("Value {} for USE_DISTUTILS treated as False".\
+        print("Value {} for USE_DISTUTILS treated as False".
               format(use_distutils))
 
-from distutils.command.build_ext import build_ext as _build_ext
-from distutils.command.build import build as _build
-
 if use_setuptools:
     try:
         from setuptools import setup
@@ -35,30 +35,37 @@
     from distutils.core import setup
     from distutils.command.install import install as _install
 
-cmake_opts = [("PYTHON_BIN", sys.executable), ("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "yes")]
+cmake_opts = [("PYTHON_BIN", sys.executable),
+              ("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "yes")]
 cmake_generator = [None]
 cmake_build_type = ["Release"]
 
+
 def process_opts(opts):
     return ['-D'+'='.join(o) for o in opts]
 
+
 def get_build_dir(dist):
     source_dir = path.dirname(path.realpath(__file__))
     build = dist.get_command_obj('build')
     build_ext = dist.get_command_obj('build_ext')
     return source_dir if build_ext.inplace else build.build_platlib
 
+
 global_user_options = [
-    ('symengine-dir=', None, 'path to symengine installation or build directory'),
+    ('symengine-dir=', None,
+     'path to symengine installation or build directory'),
     ('generator=', None, 'cmake build generator'),
     ('build-type=', None, 'build type: Release or Debug'),
     ('define=', 'D',
      'options to cmake <var>:<type>=<value>'),
 ]
 
+
 class BuildWithCmake(_build):
     sub_commands = [('build_ext', None)]
 
+
 class BuildExtWithCmake(_build_ext):
     _build_opts = _build_ext.user_options
     user_options = list(global_user_options)
@@ -98,22 +105,25 @@ def cmake_build(self):
         if build_dir != source_dir and path.exists("CMakeCache.txt"):
             os.remove("CMakeCache.txt")
 
-        cmake_cmd = ["cmake", source_dir, "-DCMAKE_BUILD_TYPE=" + cmake_build_type[0]]
+        cmake_cmd = ["cmake", source_dir,
+                     "-DCMAKE_BUILD_TYPE=" + cmake_build_type[0]]
         cmake_cmd.extend(process_opts(cmake_opts))
         if not path.exists(path.join(build_dir, "CMakeCache.txt")):
             cmake_cmd.extend(self.get_generator())
         if subprocess.call(cmake_cmd, cwd=build_dir) != 0:
             raise EnvironmentError("error calling cmake")
 
-        if subprocess.call(["cmake", "--build", ".", "--config", cmake_build_type[0]],
-                cwd=build_dir) != 0:
+        if subprocess.call(["cmake", "--build", ".",
+                            "--config", cmake_build_type[0]],
+                           cwd=build_dir) != 0:
             raise EnvironmentError("error building project")
 
     def get_generator(self):
         if cmake_generator[0]:
             return ["-G", cmake_generator[0]]
         else:
-            import platform, sys
+            import platform
+            import sys
             if (platform.system() == "Windows"):
                 compiler = str(self.compiler).lower()
                 if ("msys" in compiler):
@@ -128,9 +138,11 @@ def get_generator(self):
 
     def run(self):
         self.cmake_build()
-        # can't use super() here because _build_ext is an old style class in 2.7
+        # can't use super() here because
+        #  _build_ext is an old style class in 2.7
         _build_ext.run(self)
 
+
 class InstallWithCmake(_install):
     _install_opts = _install.user_options
     user_options = list(global_user_options)
@@ -157,7 +169,8 @@ def finalize_options(self):
 
         cmake_build_type[0] = self.build_type
         cmake_opts.extend([('PYTHON_INSTALL_PATH', self.install_platlib)])
-        cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH', self.install_headers)])
+        cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH',
+                            self.install_headers)])
 
     def cmake_install(self):
         source_dir = path.dirname(path.realpath(__file__))
@@ -170,8 +183,10 @@ def cmake_install(self):
         if subprocess.call(cmake_cmd, cwd=build_dir) != 0:
             raise EnvironmentError("error calling cmake")
 
-        if subprocess.call(["cmake", "--build", ".", "--config", cmake_build_type[0], "--target", "install"],
-                cwd=build_dir) != 0:
+        if subprocess.call(["cmake", "--build", ".",
+                            "--config", cmake_build_type[0],
+                            "--target", "install"],
+                           cwd=build_dir) != 0:
             raise EnvironmentError("error installing")
 
         import compileall
@@ -182,24 +197,25 @@ def run(self):
         _install.run(self)
         self.cmake_install()
 
+
 long_description = '''
 SymEngine is a standalone fast C++ symbolic manipulation library.
 Optional thin Python wrappers (SymEngine) allow easy usage from Python and
 integration with SymPy and Sage.'''
 
-setup(name = "symengine",
+setup(name="symengine",
       version="0.2.1.dev",
-      description = "Python library providing wrappers to SymEngine",
-      setup_requires = ['cython>=0.19.1'],
-      long_description = long_description,
-      author = "SymEngine development team",
-      author_email = "[email protected]",
-      license = "MIT",
-      url = "https://github.com/symengine/symengine.py",
+      description="Python library providing wrappers to SymEngine",
+      setup_requires=['cython>=0.19.1'],
+      long_description=long_description,
+      author="SymEngine development team",
+      author_email="[email protected]",
+      license="MIT",
+      url="https://github.com/symengine/symengine.py",
       cmdclass={
-          'build' : BuildWithCmake,
-          'build_ext' : BuildExtWithCmake,
-          'install' : InstallWithCmake,
+          'build': BuildWithCmake,
+          'build_ext': BuildExtWithCmake,
+          'install': InstallWithCmake,
           },
       classifiers=[
         'License :: OSI Approved :: MIT License',
@@ -213,4 +229,4 @@ def run(self):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         ]
-    )
+      )

symengine/__init__.py

@@ -16,7 +16,9 @@
 
 __version__ = "0.2.1.dev"
 
+
 def test():
-    import pytest, os
+    import pytest
+    import os
     return not pytest.cmdline.main(
         [os.path.dirname(os.path.abspath(__file__))])

symengine/sympy_compat.py

@@ -3,8 +3,10 @@
 from .compatibility import with_metaclass
 from .lib.symengine_wrapper import (sympify, sympify as S,
         SympifyError, sqrt, I, E, pi, Matrix, Derivative, exp,
-        Lambdify as lambdify, symarray, diff, zeros, eye, diag, ones, zeros,
+        Lambdify as lambdify, symarray, diff, eye, diag, ones, zeros,
         expand, Subs, FunctionSymbol as AppliedUndef)
+from types import ModuleType
+import sys
 
 
 class BasicMeta(type):
@@ -21,6 +23,7 @@ class Number(Basic):
     _classes = (symengine.Number,)
     pass
 
+
 class Symbol(symengine.PySymbol, Basic):
     _classes = (symengine.Symbol,)
     pass
@@ -29,7 +32,7 @@ class Symbol(symengine.PySymbol, Basic):
 class Rational(Number):
     _classes = (symengine.Rational, symengine.Integer)
 
-    def __new__(cls, num, den = 1):
+    def __new__(cls, num, den=1):
         return symengine.Integer(num) / den
 
 
@@ -68,10 +71,7 @@ def __new__(cls, name):
         return symengine.UndefFunction(name)
 
 
-from types import ModuleType
-
 functions = ModuleType(__name__ + ".functions")
-import sys
 sys.modules[functions.__name__] = functions
 
 functions.sqrt = sqrt
@@ -94,7 +94,7 @@ class _RegisteredFunction(with_metaclass(_FunctionRegistrarMeta, Function)):
 class log(_RegisteredFunction):
     _classes = (symengine.Log,)
 
-    def __new__(cls, a, b = E):
+    def __new__(cls, a, b=E):
         return symengine.log(a, b)
 
 
@@ -118,6 +118,7 @@ class tan(_RegisteredFunction):
     def __new__(cls, a):
         return symengine.tan(a)
 
+
 class gamma(_RegisteredFunction):
     _classes = (symengine.Gamma,)
 
@@ -250,6 +251,7 @@ class atan2(_RegisteredFunction):
     def __new__(cls, a, b):
         return symengine.atan2(a, b)
 
+
 '''
 for i in ("""Sin Cos Tan Gamma Cot Csc Sec ASin ACos ATan
           ACot ACsc ASec Sinh Cosh Tanh Coth ASinh ACosh ATanh

symengine/tests/test_arit.py

@@ -2,6 +2,7 @@
 
 from symengine import Symbol, Integer, Add, Pow
 
+
 def test_arit1():
     x = Symbol("x")
     y = Symbol("y")
@@ -12,6 +13,7 @@ def test_arit1():
     e = x + 1
     e = 1 + x
 
+
 def test_arit2():
     x = Symbol("x")
     y = Symbol("y")
@@ -26,11 +28,13 @@ def test_arit2():
     assert not x+x == 3*x
     assert not x+x != 2*x
 
+
 def test_arit3():
     x = Symbol("x")
     y = Symbol("y")
     raises(TypeError, lambda: ("x"*x))
 
+
 def test_arit4():
     x = Symbol("x")
     y = Symbol("y")
@@ -39,6 +43,7 @@ def test_arit4():
     assert x*x*x == x**3
     assert x*y*x*x == x**3*y
 
+
 def test_arit5():
     x = Symbol("x")
     y = Symbol("y")
@@ -50,6 +55,7 @@ def test_arit5():
     assert f == x**2 + 2*x*y + y**2
     assert isinstance(f, Add)
 
+
 def test_arit6():
     x = Symbol("x")
     y = Symbol("y")
@@ -62,6 +68,7 @@ def test_arit6():
     e = 2*x
     assert str(e) == "2*x"
 
+
 def test_arit7():
     x = Symbol("x")
     y = Symbol("y")
@@ -72,6 +79,7 @@ def test_arit7():
 
     assert 2*x*y - x*y == x*y
 
+
 def test_arit8():
     x = Symbol("x")
     y = Symbol("y")
@@ -85,6 +93,7 @@ def test_arit8():
     assert (2 * x**3 * y**2 * z)**3 / 8 == x**9 * y**6 * z**3
     assert (2*y**(-2*x**2)) * (3*y**(2*x**2)) == 6
 
+
 def test_expand1():
     x = Symbol("x")
     y = Symbol("y")
@@ -94,22 +103,26 @@ def test_expand1():
     assert ((2*x**2+3*y)**2).expand() == 4*x**4 + 12*x**2*y + 9*y**2
     assert ((2*x/3+y/4)**2).expand() == 4*x**2/9 + x*y/3 + y**2/16
 
+
 def test_arit9():
     x = Symbol("x")
     y = Symbol("y")
     assert 1/x == 1/x
     assert 1/x != 1/y
 
+
 def test_expand2():
     y = Symbol("y")
     z = Symbol("z")
     assert ((1/(y*z) - y*z)*y*z).expand() == 1-(y*z)**2
 
+
 def test_expand3():
     x = Symbol("x")
     y = Symbol("y")
     assert ((1/(x*y) - x*y+2)*(1+x*y)).expand() == 3 + 1/(x*y) + x*y - (x*y)**2
 
+
 def test_args():
     x = Symbol("x")
     y = Symbol("y")
@@ -119,6 +132,7 @@ def test_args():
     assert (2*x**2).args == (2, x**2)
     assert set((2*x**2*y).args) == set((Integer(2), x**2, y))
 
+
 def test_atoms():
     x = Symbol("x")
     y = Symbol("y")
@@ -128,6 +142,7 @@ def test_atoms():
     assert (x ** y + z).atoms() == set([x, y, z])
     assert (x**y + z).atoms(Symbol) == set([x, y, z])
 
+
 def test_free_symbols():
     x = Symbol("x")
     y = Symbol("y")

symengine/tests/test_dict_basic.py

@@ -2,6 +2,7 @@
 
 from symengine import symbols, DictBasic, sin, Integer
 
+
 def test_DictBasic():
     x, y, z = symbols("x y z")
     d = DictBasic({x: 2, y: z})
@@ -24,4 +25,4 @@ def test_DictBasic():
     assert set(d.values()) == set([x, z])
 
     e = y + sin(2*z)
-    assert e.subs(d) == z + sin(x)
+    assert e.subs(d) == z + sin(x)