Tweak formatting to comply with PEP 8 and remove extraneous comments.

anthony-tuininga · anthony-tuininga · commit 8ea16b1345e9 · 2021-01-21T10:29:43.000-07:00
diff --git a/samples/DatabaseShutdown.py b/samples/DatabaseShutdown.py
@@ -23,12 +23,12 @@
 
 # first shutdown() call must specify the mode, if DBSHUTDOWN_ABORT is used,
 # there is no need for any of the other steps
-connection.shutdown(mode = cx_Oracle.DBSHUTDOWN_IMMEDIATE)
+connection.shutdown(mode=cx_Oracle.DBSHUTDOWN_IMMEDIATE)
 
 # now close and dismount the database
 cursor = connection.cursor()
 cursor.execute("alter database close normal")
 cursor.execute("alter database dismount")
 
 # perform the final shutdown call
-connection.shutdown(mode = cx_Oracle.DBSHUTDOWN_FINAL)
+connection.shutdown(mode=cx_Oracle.DBSHUTDOWN_FINAL)
diff --git a/samples/Query.py b/samples/Query.py
@@ -34,7 +34,7 @@
 
 print("Fetch many rows")
 cursor.execute(sql)
-res = cursor.fetchmany(numRows=3)
+res = cursor.fetchmany(3)
 print(res)
 print()
 
diff --git a/samples/Subclassing.py b/samples/Subclassing.py
@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 # Subclassing.py
 #
-# Demonstrate how to subclass cx_Oracle connections and cursors in order to
+#   Demonstrate how to subclass cx_Oracle connections and cursors in order to
 # add additional functionality (like logging) or create specialized interfaces
 # for paticular applications.
 #------------------------------------------------------------------------------
diff --git a/samples/TypeHandlers.py b/samples/TypeHandlers.py
@@ -52,8 +52,8 @@ def building_out_converter(obj):
 
 def input_type_handler(cursor, value, numElements):
     if isinstance(value, Building):
-        return cursor.var(cx_Oracle.OBJECT, arraysize = numElements,
-                inconverter = building_in_converter, typename = obj_type.name)
+        return cursor.var(cx_Oracle.OBJECT, arraysize=numElements,
+                inconverter=building_in_converter, typename=obj_type.name)
 
 def output_type_handler(cursor, name, default_type, size, precision, scale):
     if default_type == cx_Oracle.OBJECT:
diff --git a/setup.py b/setup.py
@@ -1,11 +1,5 @@
-"""Setup script for cx_Oracle.
-
-Windows platforms:
-    python setup.py build --compiler=mingw32 install
-
-Unix platforms
-    python setup.py build install
-
+"""
+Setup script for cx_Oracle.
 """
 
 import os
@@ -25,58 +19,58 @@
 BUILD_VERSION = "8.2.0-dev"
 
 # setup extra link and compile args
-extraLinkArgs = []
-extraCompileArgs = []
+extra_link_args = []
+extra_compile_args = []
 if sys.platform == "aix4":
-    extraCompileArgs.append("-qcpluscmt")
+    extra_compile_args.append("-qcpluscmt")
 elif sys.platform == "aix5":
-    extraCompileArgs.append("-DAIX5")
+    extra_compile_args.append("-DAIX5")
 elif sys.platform == "cygwin":
-    extraLinkArgs.append("-Wl,--enable-runtime-pseudo-reloc")
+    extra_link_args.append("-Wl,--enable-runtime-pseudo-reloc")
 elif sys.platform == "darwin":
-    extraLinkArgs.append("-shared-libgcc")
+    extra_link_args.append("-shared-libgcc")
 
 # define cx_Oracle sources
-sourceDir = "src"
-sources = [os.path.join(sourceDir, n) \
-        for n in sorted(os.listdir(sourceDir)) if n.endswith(".c")]
+source_dir = "src"
+sources = [os.path.join(source_dir, n) \
+           for n in sorted(os.listdir(source_dir)) if n.endswith(".c")]
 depends = ["src/cxoModule.h"]
 
 # define ODPI-C sources, libraries and include directories; if the environment
 # variables ODPIC_INC_DIR and ODPIC_LIB_DIR are both set, assume these
 # locations contain a compiled installation of ODPI-C; otherwise, use the
 # source of ODPI-C found in the odpi subdirectory
-dpiIncludeDir = os.environ.get("ODPIC_INC_DIR")
-dpiLibDir = os.environ.get("ODPIC_LIB_DIR")
-if dpiIncludeDir and dpiLibDir:
-    dpiSources = []
-    includeDirs = [dpiIncludeDir]
+dpi_include_dir = os.environ.get("ODPIC_INC_DIR")
+dpi_lib_dir = os.environ.get("ODPIC_LIB_DIR")
+if dpi_include_dir and dpi_lib_dir:
+    dpi_sources = []
+    include_dirs = [dpi_include_dir]
     libraries = ["odpic"]
-    libraryDirs = [dpiLibDir]
+    library_dirs = [dpi_lib_dir]
 else:
-    includeDirs = ["odpi/include", "odpi/src"]
-    dpiSourceDir = os.path.join("odpi", "src")
-    dpiSources = [os.path.join(dpiSourceDir, n) \
-            for n in sorted(os.listdir(dpiSourceDir)) if n.endswith(".c")]
+    include_dirs = ["odpi/include", "odpi/src"]
+    dpi_source_dir = os.path.join("odpi", "src")
+    dpi_sources = [os.path.join(dpi_source_dir, n) \
+            for n in sorted(os.listdir(dpi_source_dir)) if n.endswith(".c")]
     depends.extend(["odpi/include/dpi.h", "odpi/src/dpiImpl.h",
             "odpi/src/dpiErrorMessages.h"])
     libraries = []
-    libraryDirs = []
+    library_dirs = []
 
 # setup the extension
 extension = setuptools.Extension(
-        name = "cx_Oracle",
-        include_dirs = includeDirs,
-        extra_compile_args = extraCompileArgs,
-        define_macros = [("CXO_BUILD_VERSION", BUILD_VERSION)],
-        extra_link_args = extraLinkArgs,
-        sources = sources + dpiSources,
-        depends = depends,
-        libraries = libraries,
-        library_dirs = libraryDirs)
+        name="cx_Oracle",
+        include_dirs=include_dirs,
+        extra_compile_args=extra_compile_args,
+        define_macros=[("CXO_BUILD_VERSION", BUILD_VERSION)],
+        extra_link_args=extra_link_args,
+        sources=sources + dpi_sources,
+        depends=depends,
+        libraries=libraries,
+        library_dirs=library_dirs)
 
 # perform the setup
 setuptools.setup(
-        version = BUILD_VERSION,
-        data_files = [ ("cx_Oracle-doc", ["LICENSE.txt", "README.txt"]) ],
-        ext_modules = [extension])
+        version=BUILD_VERSION,
+        data_files=[ ("cx_Oracle-doc", ["LICENSE.txt", "README.txt"]) ],
+        ext_modules=[extension])

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#------------------------------------------------------------------------------`
`6`	`6`	`# Subclassing.py`
`7`	`7`	`#`
`8`		`-# Demonstrate how to subclass cx_Oracle connections and cursors in order to`
	`8`	`+# Demonstrate how to subclass cx_Oracle connections and cursors in order to`
`9`	`9`	`# add additional functionality (like logging) or create specialized interfaces`
`10`	`10`	`# for paticular applications.`
`11`	`11`	`#------------------------------------------------------------------------------`