Permalink
Browse files

fixed more pylint and pep8 warnings

  • Loading branch information...
1 parent bef1afc commit aa06c7c2830c758876baa8d0c75964529457dbf5 @trey0 trey0 committed Sep 20, 2011
Showing with 24 additions and 19 deletions.
  1. +5 −1 doc_src/conf.py
  2. +1 −1 example/manage.py
  3. +2 −1 example/settings.py
  4. +3 −4 example/urls.py
  5. +1 −1 geocamLens/ViewLensAbstract.py
  6. +1 −1 geocamLens/admin.py
  7. +11 −10 setup.py
View
@@ -5,6 +5,9 @@
# All Rights Reserved.
# __END_LICENSE__
+# suppress warning about redefining built-in copyright
+# pylint: disable=W0622
+
#
# app documentation build configuration file, created by
# sphinx-quickstart on Wed Oct 21 13:18:22 2009.
@@ -17,7 +20,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import sys, os
+import sys
+import os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
View
@@ -7,7 +7,7 @@
from django.core.management import execute_manager
try:
- import settings # Assumed to be in the same directory.
+ import settings # Assumed to be in the same directory.
except ImportError:
import sys
sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
View
@@ -8,7 +8,8 @@
DEBUG = True
TEMPLATE_DEBUG = DEBUG
-import os, sys
+import os
+import sys
APP = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
PROJ_ROOT = os.path.abspath(os.path.dirname(__file__))
sys.path.append(APP)
View
@@ -4,7 +4,7 @@
# All Rights Reserved.
# __END_LICENSE__
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include
from django.conf import settings
# Uncomment the next two lines to enable the admin:
@@ -15,13 +15,13 @@
# Example:
# (r'^example/', include('example.foo.urls')),
- # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
+ # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation:
# (r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
-
+
)
urlpatterns = urlpatterns + patterns('',
@@ -30,4 +30,3 @@
# (r'^data/(?P<path>.*)$', 'django.views.static.serve',
# {'document_root': settings.DATA_ROOT}),
)
-
@@ -177,7 +177,7 @@ def uploadImage(self, request, userName):
newVersion = img.version + 1
else:
# create Image db record
- img = self.defaultImageModel() # pylint: disable-msg=E1102
+ img = self.defaultImageModel() # pylint: disable=E1102
img.readImportVals(storePath=tempStorePath,
uploadImageFormData=form.cleaned_data)
View
@@ -6,7 +6,7 @@
from django.contrib import admin
-from geocamLens.models import * # pylint: disable-msg=W0401
+from geocamLens.models import * # pylint: disable=W0401
admin.site.register(Snapshot)
admin.site.register(GoogleEarthSession)
View
@@ -7,6 +7,7 @@
import os
from setuptools import setup, find_packages
+
def read_file(filename):
"""Read a file into a string"""
path = os.path.abspath(os.path.dirname(__file__))
@@ -20,17 +21,17 @@ def read_file(filename):
DESC = " ".join(__import__('geocamLens').__doc__.splitlines()).strip()
setup(
- name = "geocamLensWeb",
- version = __import__('geocamLens').get_version().replace(' ', '-'),
- url = '',
- author = 'Trey Smith',
- author_email = '',
- description = DESC,
- long_description = read_file('README'),
- packages = find_packages(),
- include_package_data = True,
+ name="geocamLensWeb",
+ version=__import__('geocamLens').get_version().replace(' ', '-'),
+ url='',
+ author='Trey Smith',
+ author_email='',
+ description=DESC,
+ long_description=read_file('README'),
+ packages=find_packages(),
+ include_package_data=True,
install_requires=read_file('requirements.txt'),
- classifiers = [
+ classifiers=[
'License :: OSI Approved :: NASA Open Source Agreement',
'Framework :: Django',
],

0 comments on commit aa06c7c

Please sign in to comment.