Fixes pep8 violations

geonode/context_processors.py

@@ -184,15 +184,15 @@ def resource_urls(request):
         defaults['GOOGLE_API_KEY'] = settings.GOOGLE_API_KEY,
         defaults['GOOGLE_MAPS_API_KEY'] = settings.GOOGLE_MAPS_API_KEY
         defaults['WM_COPYRIGHT_URL'] = getattr(
-                                        settings,
-                                        'WM_COPYRIGHT_URL',
-                                        'http://gis.harvard.edu/'
-                                        )
+                                                   settings,
+                                                   'WM_COPYRIGHT_URL',
+                                                   'http://gis.harvard.edu/'
+                                               )
         defaults['WM_COPYRIGHT_TEXT'] = getattr(
-                                        settings,
-                                        'WM_COPYRIGHT_TEXT',
-                                        'Center for Geographic Analysis'
-                                        )
+                                                    settings,
+                                                    'WM_COPYRIGHT_TEXT',
+                                                    'Center for Geographic Analysis'
+                                                )
         defaults['HYPERMAP_REGISTRY_URL'] = settings.HYPERMAP_REGISTRY_URL
 
     return defaults

geonode/contrib/worldmap/gazetteer/admin.py

@@ -13,6 +13,7 @@ class GazetteerEntryAdmin(admin.ModelAdmin):
         'username',
     )
 
+
 class GazetteerAttributeAdmin(admin.ModelAdmin):
     list_display = (
         'layer_name',

geonode/contrib/worldmap/gazetteer/flexidates.py

@@ -11,14 +11,17 @@
 
 logger = logging.getLogger("geonode.flexidates")
 
+
 class FlexiDateField(models.Field):
     empty_strings_allowed = False
     default_error_messages = {
-        'invalid': _(u"'%s' value has an invalid date format. Acceptable formats include "
-                     u"YYYY-MM-DD where YYYY = year (at least 4 digits, use"
-                     u"0001 for year 1), MM = month (1-12, optional), DD = day of month (1-31, optional)."
-                     u"For BC dates insert a minus sign before year (-1000-01-01) or append with BC (1000-01-01 BC).")
-        }
+                                'invalid': _(u"'%s' value has an invalid date format. Acceptable formats include "
+                                             u"YYYY-MM-DD where YYYY = year (at least 4 digits, use"
+                                             u"0001 for year 1), MM = month (1-12, optional),"
+                                             u" DD = day of month (1-31, optional)."
+                                             u"For BC dates insert a minus sign before year (-1000-01-01)"
+                                             u" or append with BC (1000-01-01 BC).")
+                              }
     description = _("Date BC/AD (without time)")
 
     def __init__(self, verbose_name=None, name=None, auto_now=False,
@@ -56,9 +59,7 @@ def to_python(self, value):
         msg = self.error_messages['invalid_date'] % value
         raise exceptions.ValidationError(msg)
 
-
     def get_db_prep_value(self, value, connection, prepared=False):
-        import re
         # Casts dates into the format expected by the backend
         if not prepared:
             value = self.get_prep_value(value)
@@ -75,30 +76,32 @@ def formfield(self, **kwargs):
         defaults.update(kwargs)
         return super(FlexiDateField, self).formfield(**defaults)
 
+
 def parse_flex_date(dateString):
     # from datautil.date import DateutilDateParser
     from dateutil.parser import parse
     # parser = DateutilDateParser()
     # TODO fix this, fails with this error "AttributeError: 'tuple' object has no attribute 'year'"
     if dateString is not None and len(dateString) > 0:
-        #return parser.parse(dateString)
+        # return parser.parse(dateString)
         return parse(dateString)
     return None
 
+
 def parse_julian_date(dateString):
     from jdcal import gcal2jd
     flex_date = parse_flex_date(dateString)
-    julian = gcal2jd(int(flex_date.year), int(flex_date.month if flex_date.month is not '' else '1'), \
+    julian = gcal2jd(int(flex_date.year), int(flex_date.month if flex_date.month is not '' else '1'),
                      int(flex_date.day if flex_date.day is not '' else '1'))
     return julian[0] + julian[1]
 
+
 class FlexiDateInput(Input):
     input_type = 'text'
 
     def __init__(self, attrs=None, format=None):
         super(FlexiDateInput, self).__init__(attrs)
 
-
     def _format_value(self, value):
         return value
 
@@ -112,6 +115,7 @@ def _has_changed(self, initial, data):
             pass
         return super(FlexiDateInput, self)._has_changed(self._format_value(initial), data)
 
+
 class FlexiDateFormField(forms.Field):
     widget = FlexiDateInput
     default_error_messages = {
@@ -123,7 +127,6 @@ class FlexiDateFormField(forms.Field):
     def __init__(self, *args, **kwargs):
         super(FlexiDateFormField, self).__init__(*args, **kwargs)
 
-
     def to_python(self, value):
         # Try to coerce the value to unicode.
         unicode_value = force_unicode(value, strings_only=True)

geonode/contrib/worldmap/gazetteer/models.py

@@ -23,7 +23,7 @@ class GazetteerEntry(models.Model):
     end_date = models.TextField(_('End Date'), blank=True, null=True)
     julian_start = models.IntegerField(_('Julian Date Start'), blank=True, null=True)
     julian_end = models.IntegerField(_('Julian Date End'), blank=True, null=True)
-    project = models.CharField(_('Project'), max_length=255,  blank=True, null=True)
+    project = models.CharField(_('Project'), max_length=255, blank=True, null=True)
     feature = models.GeometryField(_('Geometry'), null=True, blank=True)
     username = models.CharField(_('User Name'), max_length=30, blank=True, null=True)
     objects = models.GeoManager()

geonode/contrib/worldmap/gazetteer/tests.py

@@ -9,7 +9,6 @@ class GazetteerTest(TestCase):
 
     fixtures = ['gazetteer_data.json'] if settings.USE_WORLDMAP else []
 
-
     def test_get_gazetteer_entry(self):
         if settings.USE_WORLDMAP:
             results = getGazetteerEntry(5)
@@ -85,7 +84,6 @@ def test_gazetteer_startdate_BC(self):
             self.assertEquals(3, len(placenames))
             self.assertNotContains(response, text="Paradise3", html=False, status_code=200)
 
-
     def test_gazetteer_enddate(self):
         """
         Verify that only placenames that existed on or before the input date are returned

geonode/contrib/worldmap/gazetteer/urls.py

@@ -1,17 +1,20 @@
-from django.conf.urls import *
+from django.conf.urls import patterns, url
 from .views import search, edit_layer_gazetteer
 
-urlpatterns = patterns('',
-    url(r'^gazetteer/edit/(?P<layername>[^/]*)$',
-        edit_layer_gazetteer,
-        name = 'edit_layer_gazetteer'),
-    url(r'^gazetteer/(?P<place_name>[^/]+)' +
-        '(/Service/(?P<services>[\w\,]+))?' +
-        '(/Project/(?P<project>[A-Za-z0-9_-]+))?' +
-        '(/Map/(?P<map>[\d]+))?' +
-        '(/Layer/(?P<layer>[A-Za-z0-9_-]+))?' +
-        '(/StartDate/(?P<start_date>[\d\s\/\-\:]+(\sBC|\sAD)?))?' +
-        '(/EndDate/(?P<end_date>[\d\s\/\-\:]+(\sBC|\sAD)?))?' +
-        '(/User/(?P<user>[A-Za-z0-9_-]+))?' +
-        '(/(?P<format>(json|xml)))?$', search),
-)
+urlpatterns = patterns(
+                        '',
+                        url(
+                                r'^gazetteer/edit/(?P<layername>[^/]*)$',
+                                edit_layer_gazetteer,
+                                name='edit_layer_gazetteer'
+                           ),
+                        url(r'^gazetteer/(?P<place_name>[^/]+)' +
+                            '(/Service/(?P<services>[\w\,]+))?' +
+                            '(/Project/(?P<project>[A-Za-z0-9_-]+))?' +
+                            '(/Map/(?P<map>[\d]+))?' +
+                            '(/Layer/(?P<layer>[A-Za-z0-9_-]+))?' +
+                            '(/StartDate/(?P<start_date>[\d\s\/\-\:]+(\sBC|\sAD)?))?' +
+                            '(/EndDate/(?P<end_date>[\d\s\/\-\:]+(\sBC|\sAD)?))?' +
+                            '(/User/(?P<user>[A-Za-z0-9_-]+))?' +
+                            '(/(?P<format>(json|xml)))?$', search),
+                      )