Skip to content

Commit

Permalink
fixed more pylint and pep8 warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
trey0 committed Sep 20, 2011
1 parent e3b16d6 commit ace2ff6
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 17 deletions.
6 changes: 5 additions & 1 deletion doc_src/conf.py
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/manage.py
Expand Up @@ -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__)
Expand Down
3 changes: 2 additions & 1 deletion example/settings.py
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions example/urls.py
Expand Up @@ -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:
Expand All @@ -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('',
Expand All @@ -30,4 +30,3 @@
# (r'^data/(?P<path>.*)$', 'django.views.static.serve',
# {'document_root': settings.DATA_ROOT}),
)

21 changes: 11 additions & 10 deletions setup.py
Expand Up @@ -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__))
Expand All @@ -20,17 +21,17 @@ def read_file(filename):
DESC = " ".join(__import__('geocamAware').__doc__.splitlines()).strip()

setup(
name = "geocamAwareWeb",
version = __import__('geocamAware').get_version().replace(' ', '-'),
url = '',
author = 'Trey Smith',
author_email = '',
description = DESC,
long_description = read_file('README'),
packages = find_packages(),
include_package_data = True,
name="geocamAwareWeb",
version=__import__('geocamAware').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',
],
Expand Down

0 comments on commit ace2ff6

Please sign in to comment.