Small but helpful improvements in checksrc; some clean-up as suggested by this tool.

Author: Cito

CGIWrapper/CGIWrapper.py

@@ -10,11 +10,10 @@
 
 # We first record the starting time, in case we're being run as a CGI script.
 from time import time, localtime, asctime
-serverStartTime  = time()
+serverStartTime = time()
 
 # Some imports
 import cgi, os, sys, traceback
-from types import ClassType, DictType, FloatType
 from random import randint
 try:
     from cStringIO import StringIO
@@ -118,7 +117,7 @@ def userConfig(self):
             config = f.read()
             config = eval('dict(%s)' % config)
             f.close()
-            assert isinstance(config, DictType)
+            assert isinstance(config, dict)
             return config
 
     def config(self):
@@ -231,8 +230,9 @@ def writeScriptLog(self):
         values = []
         for column in self.setting('ScriptLogColumns'):
             value = valueForName(self, column)
-            if isinstance(value, FloatType):
-                value = '%0.4f' % value # might need more flexibility in the future
+            if isinstance(value, float):
+                # might need more flexibility in the future
+                value = '%0.4f' % value
             else:
                 value = str(value)
             values.append(value)
@@ -257,17 +257,18 @@ def handleException(self, excInfo):
         self._scriptEndTime = time()
         self.logExceptionToConsole()
         self.reset()
-        print self.htmlErrorPage(showDebugInfo=self.setting('ShowDebugInfoOnErrors'))
+        print self.htmlErrorPage(
+            showDebugInfo=self.setting('ShowDebugInfoOnErrors'))
         fullErrorMsg = None
         if self.setting('SaveErrorMessages'):
-            fullErrorMsg = self.htmlErrorPage(showDebugInfo=1)
+            fullErrorMsg = self.htmlErrorPage(showDebugInfo=True)
             filename = self.saveHTMLErrorPage(fullErrorMsg)
         else:
             filename = ''
         self.logExceptionToDisk(filename)
         if self.setting('EmailErrors'):
             if fullErrorMsg is None:
-                fullErrorMsg = self.htmlErrorPage(showDebugInfo=1)
+                fullErrorMsg = self.htmlErrorPage(showDebugInfo=True)
             self.emailException(fullErrorMsg)
 
     def logExceptionToConsole(self, stderr=sys.stderr):
@@ -279,7 +280,8 @@ def logExceptionToConsole(self, stderr=sys.stderr):
 
         """
         # stderr logging
-        stderr.write('[%s] [error] CGI Wrapper: Error while executing script %s\n' % (
+        stderr.write('[%s] [error] CGI Wrapper:'
+            ' Error while executing script %s\n' % (
             asctime(localtime(self._scriptEndTime)), self._scriptPathname))
         traceback.print_exc(file=stderr)
 
@@ -291,7 +293,8 @@ def reset(self):
         Currently resets headers and deletes cookies, if present.
 
         """
-        # Set headers to basic text/html. We don't want stray headers from a script that failed.
+        # Set headers to basic text/html. We don't want stray headers
+        # from a script that failed.
         self._headers = self.makeHeaders()
         # Get rid of cookies, too
         if 'cookies' in self._namespace:
@@ -300,8 +303,8 @@ def reset(self):
     def htmlErrorPage(self, showDebugInfo=True):
         """Return an HTML page explaining that there is an error.
 
-        There could be more options in the future so using named arguments
-        (e.g., 'showDebugInfo=1') is recommended. Invoked by handleException().
+        There could be more options in the future, so using named arguments
+        (e.g. showDebugInfo=False) is recommended. Invoked by handleException().
 
         """
         html = ['''%s
@@ -387,16 +390,16 @@ def logExceptionToDisk(self, errorMsgFilename=None, excInfo=None):
         if not excInfo:
             excInfo = sys.exc_info()
         err, msg = excInfo[:2]
-        if isinstance(err, ClassType):
-            err, msg = err.__name__, str(msg)
-        else: # string exception
+        if isinstance(err, basestring): # string exception
             err, msg = '', str(msg or err)
+        else:
+            err, msg = err.__name__, str(msg)
         logline = (asctime(localtime(self._scriptEndTime)),
             os.path.split(self._scriptPathname)[1], self._scriptPathname,
             err, msg, errorMsgFilename or '')
         def fixElement(element):
             element = str(element)
-            if element.find(',') >= 0 or element.find('"') >= 0:
+            if ',' in element or '"' in element:
                 element = element.replace('"', '""')
                 element = '"%s"' % element
             return element

CGIWrapper/_dumpCSV.py

@@ -45,13 +45,15 @@ def title(self):
     def writeBody(self):
         rows = LoadCSV(self._filename)
 
-        self.writeln('<table align="center" border="0" cellpadding="2" cellspacing="2">')
+        self.writeln('<table align="center"'
+            ' border="0" cellpadding="2" cellspacing="2">')
 
         # Head row gets special formatting
         self._headings = map(lambda name: name.strip(), rows[0])
         self.writeln('<tr>')
         for value in self._headings:
-            self.writeln('<th style="color:white;font-family:Arial,Helvetica,sans-serif" bgcolor="#101040">',
+            self.writeln('<th style="color:white;'
+                'font-family:Arial,Helvetica,sans-serif" bgcolor="#101040">',
             value, '</th>')
         self.writeln('</tr>')
 

COMKit/__init__.py

@@ -27,8 +27,8 @@ def InstallInWebKit(appServer):
 
         # Set references to the COM initialize and uninitialize functions
         appServer._initCOM = pythoncom.COINIT_MULTITHREADED
-        appServer.initCOM  = pythoncom.CoInitializeEx
-        appServer.closeCOM  = pythoncom.CoUninitialize
+        appServer.initCOM = pythoncom.CoInitializeEx
+        appServer.closeCOM = pythoncom.CoUninitialize
 
         # Monkey-patch this instance of the appServer
 

DocSupport/.checksrc.config

@@ -1,4 +1,4 @@
 # checksrc.config
 {
-    'SkipFiles': ['autotoc', 'pytp', 'py2html']
+    'SkipFiles': ['autotoc', 'buildhtml', 'pytp', 'py2html']
 }

MiddleKit/Core/Klass.py

@@ -29,7 +29,8 @@ def __init__(self, klassContainer, rawDict=None):
         self._attrsByName = {}
         self._superklass = None
         self._subklasses = []
-        self._pyClass = False   # False means never computed. None would mean computed, but not found.
+        # False means never computed; None would mean computed, but not found:
+        self._pyClass = False
         self._backObjRefAttrs = None
         self._allAttrs = None
         if rawDict is not None:

MiddleKit/Core/Klasses.py

@@ -197,4 +197,5 @@ def dump(self):
             print klass
 
     def debugString(self):
-        return '<%s 0x%x model=%r>' % (self.__class__.__name__, id(self), getattr(self, '_model', '(none)'))
+        return '<%s 0x%x model=%r>' % (self.__class__.__name__,
+            id(self), getattr(self, '_model', '(none)'))

MiddleKit/Core/ObjRefAttr.py

@@ -7,7 +7,7 @@ def objRefJoin(klassId, serialNum):
 
 def objRefSplit(objRef):
     """Return a tuple with (klassId, serialNum) given the 64-bit (e.g., long type) objRef."""
-    return ((objRef & 0xFFFFFFFF00000000L) >> 32, objRef & 0xFFFFFFFFL)
+    return (objRef & 0xFFFFFFFF00000000L) >> 32, objRef & 0xFFFFFFFFL
 
 
 class ObjRefAttr(Attr):
@@ -34,5 +34,6 @@ def awakeFromRead(self):
         self._targetKlass = self.model().klass(self.targetClassName(), None)
         if not self._targetKlass:
             from Model import ModelError
-            raise ModelError('class %s: attr %s: cannot locate target class %s for this obj ref.' % (
+            raise ModelError('class %s: attr %s:'
+                'cannot locate target class %s for this obj ref.' % (
                 self.klass().name(), self.name(), self.targetClassName()))

MiddleKit/Design/Doc.py

@@ -74,17 +74,17 @@ def generateHTML(self):
 ''' % self.destStyleSheetFilename)
 
         wr('<div class="head1">%s Model (MiddleKit)</div>\n'
-           % self.model.name())
+            % self.model.name())
         wr('Generated on %s <br>\n' % time.asctime())
         wr('From %s <br>\n' % self.model.filename())
 
         wr('<br>\n')
 
         wr('<table border="0" cellpadding="2" cellspacing="2">\n')
         wr('<tr class="Class">'
-           '<td class="ClassName" colspan="3">Classes</td></tr>\n')
+            '<td class="ClassName" colspan="3">Classes</td></tr>\n')
         wr('<tr class="AttrTitles"><td class=AttrTitles>In Alpha Order</td>'
-           '<td class="AttrTitles">In Inheritance Order</td></tr>\n')
+            '<td class="AttrTitles">In Inheritance Order</td></tr>\n')
         wr('<tr><td valign=top>\n')
         klasses = self.model.allKlassesInOrder()[:]
         klasses.sort(lambda a, b: cmp(a.name().lower(), b.name().lower()))
@@ -120,7 +120,7 @@ def generateHTML(self):
             wr('<table border="0" cellpadding="3" cellspacing="0">\n')
             if klass.get('isAbstract'):
                 wr('<tr><td valign="top">abstract:</td>'
-                   '<td valign="top">yes</td></tr>\n')
+                    '<td valign="top">yes</td></tr>\n')
             wr('<tr><td valign="top">ancestors:</td><td valign="top">')
             ancestor = klass.superklass()
             if ancestor:

MiddleKit/Design/Generate.py

@@ -55,15 +55,19 @@ def usage(self, errorMsg=None):
         progName = os.path.basename(sys.argv[0])
         if errorMsg:
             print '%s: error: %s' % (progName, errorMsg)
-        print 'Usage: %s --db DBNAME --model FILENAME [--sql] [--py] [--config FILENAME] [--outdir DIRNAME]' % progName
-        print '       %s -h | --help' % progName
-        print
-        print '       * Known databases include: %s' % ', '.join(self.databases())
-        print '       * If neither --sql nor --py are specified, both are generated.'
-        print '       * If --outdir is not specified, then the base filename (sans extension) is used.'
-        print '       * --config lets you specify a different config filename inside the model.'
-        print '         This is mostly useful for the regression test suite.'
-        print
+            print
+        print '''\
+Usage: %s --db DBNAME --model FILENAME \\
+           [--sql] [--py] [--config FILENAME] [--outdir DIRNAME]
+       %s -h | --help
+
+    * Known databases include: %s.
+    * If neither --sql nor --py are specified, both are generated.
+    * If --outdir is not specified,
+      then the base filename (sans extension) is used.
+    * --config lets you specify a different config filename inside the model.
+      This is mostly useful for the regression test suite.
+'''  % (progName, progName, ', '.join(self.databases()))
         sys.exit(1)
 
     def options(self, args):

MiddleKit/Design/PythonGenerator.py

@@ -205,7 +205,8 @@ def writePyAccessors(self, out):
         self.writePyGet(out)
         self.writePySet(out)
         if self.setting('AccessorStyle', 'methods') == 'properties':
-            out.write('\n\n    %s = property(%s, %s)\n\n' % (self.name(), self.pyGetName(), self.pySetName()))
+            out.write('\n\n    %s = property(%s, %s)\n\n' % (
+                self.name(), self.pyGetName(), self.pySetName()))
 
     def writePyGet(self, out):
         out.write('''
@@ -396,7 +397,8 @@ def %(getName)sString(self):
 ''' % locals())
             if self.setting('AccessorStyle', 'methods') == 'properties':
                 out.write('\n\n    %(name)sString = property(%(getName)sString,'
-                    ' "Returns the string form of %(name)s (instead of the integer value).")\n\n' % locals())
+                    ' "Returns the string form of %(name)s'
+                    ' (instead of the integer value).")\n\n' % locals())
 
     def writePySetChecks(self, out):
         Attr.writePySetChecks.im_func(self, out)

MiddleKit/Design/SQLGenerator.py

@@ -49,7 +49,7 @@ class SQLGenerator(CodeGenerator):
             useDatabaseSQL()
           StringAttr
           EnumAttr
-          
+
     """
 
     def sqlDatabaseName(self):
@@ -244,10 +244,9 @@ def writeInsertSamplesSQLForLines(self, lines, generator, file, filename):
                                     try:
                                         refByAttr = attr.targetKlass().lookupAttr(refByAttrName)
                                     except KeyError:
-                                        raise SampleError(linenum,
-                                            "Attribute %r of class %r has a 'by' of %r,"
-                                            " but no such attribute can be found in target class %r."
-                                            % (name, klass.name(),
+                                        raise SampleError(linenum, "Attribute %r of class %r"
+                                            " has a 'by' of %r, but no such attribute can be"
+                                            " found in target class %r." % (name, klass.name(),
                                                 refByAttrName, attr.targetKlass().name()))
                                     attr.refByAttr = refByAttr
                                 else:
@@ -627,19 +626,8 @@ def writeCreateSQL(self, generator, out):
             else:
                 out.write('    /* %(Name)s %(Type)s - not a SQL column */' % self)
         except Exception:
-            bar = '*'*78
-            print
-            print bar
-            print 'exception for attribute:'
+            print 'Exception for attribute:'
             print '%s.%s' % (self.klass().name(), self.name())
-            print
-            try:
-                from pprint import pprint
-                pprint(self.data)
-            except Exception:
-                pass
-            print bar
-            print
             raise
 
     def writeRealCreateSQLColumn(self, generator, out):

MiddleKit/Run/MSSQLObjectStore.py

@@ -61,9 +61,10 @@ def newConnection(self):
         args = self._dbArgs.copy()
         if args.get('DriverConnect'):
             # @@ problem here is that clear_auto_commit can't be set to zero
-            # example: storeArgs = {'DriverConnect': 'DRIVER=SQL Server;UID=echuck;Trusted_Connection=Yes;WSID=ALIEN;SERVER=ALIEN'}
+            # example: storeArgs = {'DriverConnect': 'DRIVER=SQL Server;'
+            # 'UID=echuck;Trusted_Connection=Yes;WSID=ALIEN;SERVER=ALIEN'}
             # ODBC driver connection keywords are documented here:
-            # http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbcsql/od_odbc_d_4x4k.asp
+            # http://msdn.microsoft.com/de-de/library/ms131421.aspx
             s = args['DriverConnect']
             if 'DATABASE=' not in s:
                 if not s.endswith(';'):

MiddleKit/Run/MiddleObject.py

@@ -118,7 +118,8 @@ def readStoreData(self, store, row):
 
             self._mk_initing = False
             self._mk_inStore = True
-            self._mk_changed = False # setting the values above will have caused this to be set; clear it now
+            # setting the values above will cause _mk_changed to be set
+            self._mk_changed = False # clear it now
         finally:
             self._mk_cacheLock.release()
         return self

MiddleKit/Run/ObjectStore.py

@@ -267,10 +267,12 @@ def _deleteObject(self, obj, objectsToDel, detaches, superobject=None):
         if v:
             if superobject:
                 cascadeString = 'cascade-'
-                dueTo = ' due to deletion of %s.%i' % (superobject.klass().name(), superobject.serialNum())
+                dueTo = ' due to deletion of %s.%i' % (
+                    superobject.klass().name(), superobject.serialNum())
             else:
                 cascadeString = dueTo = ''
-            print 'checking %sdelete of %s.%d%s' % (cascadeString, obj.klass().name(), obj.serialNum(), dueTo)
+            print 'checking %sdelete of %s.%d%s' % (
+                cascadeString, obj.klass().name(), obj.serialNum(), dueTo)
 
         objectsToDel[id(obj)] = obj
 

MiddleKit/Run/SQLObjectStore.py

@@ -359,7 +359,8 @@ def fetchObject(self, aClass, serialNum, default=NoDefault):
             assert count == 1
             return objects[0]
 
-    def fetchObjectsOfClass(self, aClass, clauses='', isDeep=True, refreshAttrs=True, serialNum=None):
+    def fetchObjectsOfClass(self, aClass,
+            clauses='', isDeep=True, refreshAttrs=True, serialNum=None):
         """Fetch a list of objects of a specific class.
 
         The list may be empty if no objects are found.
@@ -390,15 +391,16 @@ def fetchObjectsOfClass(self, aClass, clauses='', isDeep=True, refreshAttrs=True
         deepObjs = []
         if isDeep:
             for subklass in klass.subklasses():
-                deepObjs.extend(self.fetchObjectsOfClass(subklass, clauses, isDeep, refreshAttrs, serialNum))
+                deepObjs.extend(self.fetchObjectsOfClass(
+                    subklass, clauses, isDeep, refreshAttrs, serialNum))
 
         # Now get objects of this exact class
         objs = []
         if not klass.isAbstract():
             fetchSQLStart = klass.fetchSQLStart()
             className = klass.name()
             if serialNum is not None:
-                serialNum = int(serialNum) # make sure it's a valid int (suppose it came in as a string: 'foo')
+                serialNum = int(serialNum) # make sure it's a valid int
                 clauses = 'where %s=%d' % (klass.sqlSerialColumnName(), serialNum)
             if self._markDeletes:
                 clauses = self.addDeletedToClauses(clauses)
@@ -1041,7 +1043,7 @@ def sqlForNonNone(self, value):
             if self.setting('UseBigIntObjRefColumns', False):
                 return str(value.sqlObjRef())
             else:
-                return (str(value.klass().id()), str(value.serialNum()))
+                return str(value.klass().id()), str(value.serialNum())
 
     def sqlUpdateExpr(self, value):
         """Return update assignments.

MiddleKit/Tests/MKDateTime.mkmodel/TestEmpty.py

@@ -65,8 +65,8 @@ def testMXDateTime(store):
     from mx.DateTime import DateTimeFrom, TimeFrom
     print 'Testing with mx.DateTime module.'
 
-    d  = DateTimeFrom('2001-06-07')
-    t  = TimeFrom('12:42')
+    d = DateTimeFrom('2001-06-07')
+    t = TimeFrom('12:42')
     dt = DateTimeFrom('2001-06-07 12:42')
 
     f = Foo()
@@ -76,8 +76,8 @@ def testMXDateTime(store):
 
     storeFoo(store, f)
 
-    d  = DateTimeFrom('2002-11-11')
-    t  = TimeFrom('16:04')
+    d = DateTimeFrom('2002-11-11')
+    t = TimeFrom('16:04')
     dt = DateTimeFrom('2002-11-11 16:04')
 
     f.setD(d)