fix lint warnings

Author: trey0

doc_src/conf.py

@@ -184,8 +184,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'app.tex', u'geocamLensWeb Documentation',
-   u'Trey Smith', 'manual'),
+    ('index', 'app.tex', u'geocamLensWeb Documentation',
+     u'Trey Smith', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

example/settings.py

@@ -77,7 +77,7 @@
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
+    # 'django.template.loaders.eggs.load_template_source',
 )
 
 MIDDLEWARE_CLASSES = (

example/urls.py

@@ -11,7 +11,9 @@
 from django.contrib import admin
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
+
     # Example:
     # (r'^example/', include('example.foo.urls')),
 
@@ -24,9 +26,11 @@
 
 )
 
-urlpatterns = urlpatterns + patterns('',
+urlpatterns = urlpatterns + patterns(
+    '',
+
     (r'^static/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT}),
-#    (r'^data/(?P<path>.*)$', 'django.views.static.serve',
-#        {'document_root': settings.DATA_ROOT}),
-    )
+    # (r'^data/(?P<path>.*)$', 'django.views.static.serve',
+    #  {'document_root': settings.DATA_ROOT}),
+)

geocamLens/SearchAbstract.py

@@ -15,7 +15,7 @@ class BadQuery(Exception):
     pass
 
 
-class SearchAbstract:
+class SearchAbstract(object):
     # override these settings in derived classes
     getAllFeatures = None
     fields = ()
@@ -51,14 +51,14 @@ def filterFieldAfter(self, query, clause, field, term, negated):
         return Q(**{self.timeField + '__gte': utcDT})
 
     def filterFieldDefault(self, query, clause, field, term, negated):
-        if field == None:
+        if field is None:
             fields = self.flookup.keys()
         elif field not in self.flookup:
             raise BadQuery("Oops, can't understand field name '%s' of search '%s'.  Legal field names are: %s."
                            % (field, query, ', '.join(self.flookup.keys())))
         else:
             fields = [field]
-        if not re.search('^[\.\-\_a-zA-Z0-9]*$', term):
+        if not re.search(r'^[\.\-\_a-zA-Z0-9]*$', term):
             raise BadQuery("Oops, can't understand term '%s' in search '%s'.  Terms must contain only letters, numbers, periods, hyphens, and underscores."
                            % (term, query))
         if term == '':
@@ -103,7 +103,7 @@ def queryTreeToString(self, queryTree):
                        for term in queryTree]))
 
     def parseQuery(self, query):
-        if not re.search('^[\-\.\:\_a-zA-Z0-9 ]*$', query):
+        if not re.search(r'^[\-\.\:\_a-zA-Z0-9 ]*$', query):
             raise BadQuery("Oops, can't understand search '%s'. Searches must contain only letters, numbers, minus signs, colons, periods, underscores, and spaces."
                            % query)
         queryClauses = query.split()

geocamLens/UploadClient.py

@@ -14,6 +14,8 @@
 
 from geocamUtil import MimeMultipartFormData
 
+# pylint: disable=C1001
+
 
 class UploadClient:
     def __init__(self, url, userName='root', password=''):
@@ -80,7 +82,7 @@ def uploadImage(self, imageName, attributes, downsampleFactor=1):
     def uploadTrack(self, url, trackName, attributes=None):
         trackData = file(trackName, 'r').read()
 
-        if attributes == None:
+        if attributes is None:
             attributes = dict(trackUploadProtocolVersion='1.0')
 
         #cookieProcessor = urllib2.HTTPCookieProcessor()

geocamLens/ViewKml.py

@@ -15,6 +15,8 @@
 from geocamLens.models import GoogleEarthSession
 from geocamLens import settings
 
+# pylint: disable=C1001
+
 CACHED_CSS = None
 
 

geocamLens/ViewLensAbstract.py

@@ -66,7 +66,7 @@ def getFeaturesGeoJson(self, request):
                 numFeatures = int(numFeaturesParam)
         else:
             numFeatures = settings.GEOCAM_LENS_DEFAULT_NUM_FEATURES
-        if numFeatures != None:
+        if numFeatures is not None:
             matches = matches[:numFeatures]
 
         if errorMessage:

geocamLens/bin/simpleImport.py

@@ -168,7 +168,7 @@ def doit(opts, importDirs):
     if opts.secure:
         opts.upload = True
         assert opts.url
-        if opts.password == None:
+        if opts.password is None:
             opts.password = getpass.getpass('password for %s at %s: ' % (opts.user, opts.url))
     if opts.upload:
         opts.url = opts.url.rstrip('/')

geocamLens/forms.py

@@ -12,6 +12,8 @@
 
 from geocamLens.models import Photo
 
+# pylint: disable=R0924,E1101,C1001
+
 
 # the field names in this form are currently retained for backward compatibility with old versions
 # of GeoCam Mobile

geocamLens/models.py

@@ -37,6 +37,8 @@
 
 from geocamLens import settings
 
+# pylint: disable=C1001,E1101
+
 TIME_ZONES = None
 TOP_TIME_ZONES = ['US/Pacific', 'US/Eastern', 'US/Central', 'US/Mountain']
 TIME_ZONES = TOP_TIME_ZONES + [tz for tz in pytz.common_timezones
@@ -84,7 +86,7 @@
     (STATUS_ACTIVE, 'active'),
     # deleted but not purged yet
     (STATUS_DELETED, 'deleted'),
-    )
+)
 
 WF_NEEDS_EDITS = 0
 WF_SUBMITTED_FOR_VALIDATION = 1
@@ -95,7 +97,7 @@
     (WF_SUBMITTED_FOR_VALIDATION, 'Submitted for validation'),
     (WF_VALID, 'Valid'),
     (WF_REJECTED, 'Rejected'),
-    )
+)
 DEFAULT_WORKFLOW_STATUS = WF_SUBMITTED_FOR_VALIDATION
 
 CARDINAL_DIRECTIONS = ['N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE',
@@ -176,7 +178,7 @@ def getThumbnailPath(self, width):
 
     def calcThumbSize(self, fullWidth, fullHeight, maxOutWidth,
                       maxOutHeight=None):
-        if maxOutHeight == None:
+        if maxOutHeight is None:
             maxOutHeight = (maxOutWidth * 3) // 4
         if float(maxOutWidth) / fullWidth < float(maxOutHeight) / fullHeight:
             thumbWidth = maxOutWidth
@@ -233,7 +235,7 @@ def galleryThumb(self):
                          % (w0, h0, self.getThumbnailUrl(w0), w, h))
 
     def getRotatedIconDict(self):
-        if self.yaw == None:
+        if self.yaw is None:
             return self.getStyledIconDict()
         rot = self.yaw
         rotRounded = 10 * int(0.1 * rot + 0.5)
@@ -275,10 +277,11 @@ def getBalloonHtml(self, request):
      border="0"
      />
   </a>
-""" % dict(viewerUrl=viewerUrl,
-           thumbnailUrl=thumbnailUrl,
-           dw=dw,
-           dh=dh))
+""" %
+                          dict(viewerUrl=viewerUrl,
+                               thumbnailUrl=thumbnailUrl,
+                               dw=dw,
+                               dh=dh))
         else:
             result.append("""
 <div><a href="%(viewerUrl)s">Show detail view</a></div>
@@ -304,16 +307,16 @@ def getUploadImageFormVals(self, formData):
             folderMatches = Folder.objects.filter(name=folderName)
             if folderMatches:
                 folder = folderMatches[0]
-        if folder == None:
+        if folder is None:
             folder = Folder.objects.get(id=1)
 
         tzone = pytz.timezone(settings.TIME_ZONE)
         timestampStr = Xmp.checkMissing(formData.get('cameraTime', None))
-        if timestampStr == None:
+        if timestampStr is None:
             timestampUtc = None
         else:
             timestampLocal = parseUploadTime(timestampStr)
-            if timestampLocal.tzinfo == None:
+            if timestampLocal.tzinfo is None:
                 timestampLocal = tzone.localize(timestampLocal)
             timestampUtc = (timestampLocal
                             .astimezone(pytz.utc)
@@ -340,7 +343,7 @@ def getUploadImageFormVals(self, formData):
                          yaw=yaw,
                          yawRef=yawRef)
         formVals = dict([(k, v) for k, v in formVals0.iteritems()
-                         if Xmp.checkMissing(v) != None])
+                         if Xmp.checkMissing(v) is not None])
         return formVals
 
     @staticmethod
@@ -371,7 +374,7 @@ def processVals(self, vals):
 
         # find any '#foo' hashtags in notes and add them to the tags field
         if 'notes' in vals:
-            for hashtag in re.finditer('\#([\w0-9_]+)', vals['notes']):
+            for hashtag in re.finditer(r'\#([\w0-9_]+)', vals['notes']):
                 tagsList.append(hashtag.group(1))
             vals['tags'] = self.makeTagsString(tagsList)
 
@@ -384,15 +387,15 @@ def processVals(self, vals):
     def getImportVals(self, storePath=None, uploadImageFormData=None):
         vals = {'icon': settings.GEOCAM_LENS_DEFAULT_ICON}
 
-        if storePath != None:
+        if storePath is not None:
             xmpVals = self.getXmpVals(storePath)
             print >> sys.stderr, 'getImportVals: exif/xmp data:', xmpVals
             vals.update(xmpVals)
 
-        if uploadImageFormData != None:
+        if uploadImageFormData is not None:
             formVals = self.getUploadImageFormVals(uploadImageFormData)
             print >> sys.stderr, 'getImportVals: UploadImageForm data:', \
-                  formVals
+                formVals
             vals.update(formVals)
 
         self.processVals(vals)
@@ -455,7 +458,7 @@ def getCaptionTimeZone(self):
         return pytz.timezone(settings.DEFAULT_TIME_ZONE['code'])
 
     def getCaptionTimeStamp(self):
-        if self.timestamp == None:
+        if self.timestamp is None:
             return '(unknown)'
         else:
             tzone = self.getCaptionTimeZone()
@@ -467,20 +470,20 @@ def getCaptionTimeStamp(self):
             return '%s %s' % (str(localizedDt), tzName)
 
     def getCaptionFieldLatLon(self):
-        if self.latitude == None:
+        if self.latitude is None:
             val = '(unknown)'
         else:
             val = '%.5f, %.5f' % (self.latitude, self.longitude)
         return ['lat, lon', val]
 
     def getCaptionFieldHeading(self):
-        if self.yaw == None:
+        if self.yaw is None:
             val = '(unknown)'
         else:
             dirIndex = int(round(self.yaw / 22.5)) % 16
             cardinal = CARDINAL_DIRECTIONS[dirIndex]
 
-            if self.yawRef == None:
+            if self.yawRef is None:
                 yawStr = 'unknown'
             else:
                 yawStr = YAW_REF_LOOKUP[self.yawRef]
@@ -490,7 +493,7 @@ def getCaptionFieldHeading(self):
         return ['heading', val]
 
     def getCaptionFieldTime(self):
-        if self.timestamp == None:
+        if self.timestamp is None:
             val = '(unknown)'
         else:
             val = self.getCaptionTimeStamp()
@@ -504,13 +507,13 @@ def getCaptionFields(self):
         return ['latLon', 'heading', 'time']
 
     def getCaptionHeader(self):
-        if self.timestamp == None:
+        if self.timestamp is None:
             tsVal = '(unknown)'
         else:
             tsVal = (TimeUtil
                      .getTimeShort(self.timestamp,
                                    tz=self.getCaptionTimeZone()))
-        if self.name == None:
+        if self.name is None:
             nameVal = '(untitled)'
         else:
             nameVal = self.name

geocamLens/urls.py

@@ -47,4 +47,4 @@
     # Mobile *if* user authentication is off (not recommended!).
     (r'^upload/(?P<userName>[^/]+)/$', views.uploadImage),
 
-    )
+)