Permalink
Browse files

Fixed #21266 -- Fixed E201,E202 pep8 warnings.

  • Loading branch information...
1 parent 42a67ec commit 83b9bfea44e23c5770fa14a8921914839929233b @larryone larryone committed with timgraham Oct 14, 2013
Showing with 152 additions and 145 deletions.
  1. +1 −1 django/contrib/admin/validation.py
  2. +2 −2 django/contrib/comments/moderation.py
  3. +1 −1 django/contrib/gis/db/backends/postgis/introspection.py
  4. +2 −2 django/contrib/gis/db/models/sql/compiler.py
  5. +2 −2 django/contrib/gis/db/models/sql/where.py
  6. +10 −9 django/contrib/gis/gdal/error.py
  7. +14 −13 django/contrib/gis/gdal/field.py
  8. +2 −2 django/contrib/gis/gdal/geometries.py
  9. +1 −1 django/contrib/gis/gdal/tests/test_geom.py
  10. +4 −3 django/contrib/gis/geoip/prototypes.py
  11. +2 −2 django/contrib/gis/geos/mutable_list.py
  12. +3 −3 django/contrib/gis/geos/tests/test_mutable_list.py
  13. +1 −1 django/contrib/gis/maps/google/zoom.py
  14. +1 −1 django/contrib/gis/tests/distapp/tests.py
  15. +1 −1 django/contrib/gis/tests/geo3d/tests.py
  16. +9 −7 django/contrib/gis/tests/geoapp/tests.py
  17. +1 −1 django/core/context_processors.py
  18. +12 −12 django/dispatch/saferef.py
  19. +1 −1 django/template/debug.py
  20. +3 −3 django/test/_doctest.py
  21. +34 −34 django/utils/termcolors.py
  22. +2 −2 django/views/debug.py
  23. +1 −1 setup.cfg
  24. +3 −3 tests/admin_custom_urls/tests.py
  25. +3 −1 tests/admin_widgets/tests.py
  26. +1 −1 tests/cache/tests.py
  27. +2 −2 tests/defaultfilters/tests.py
  28. +2 −2 tests/forms_tests/tests/test_fields.py
  29. +1 −1 tests/forms_tests/tests/test_formsets.py
  30. +2 −2 tests/i18n/tests.py
  31. +1 −1 tests/model_forms/tests.py
  32. +11 −11 tests/template_tests/filters.py
  33. +13 −13 tests/template_tests/tests.py
  34. +1 −1 tests/utils_tests/test_http.py
  35. +2 −2 tests/utils_tests/test_text.py
@@ -403,7 +403,7 @@ def validate_formset(self, cls, model):
def check_type(cls, attr, type_):
if getattr(cls, attr, None) is not None and not isinstance(getattr(cls, attr), type_):
raise ImproperlyConfigured("'%s.%s' should be a %s."
- % (cls.__name__, attr, type_.__name__ ))
+ % (cls.__name__, attr, type_.__name__))
def check_isseq(cls, label, obj):
if not isinstance(obj, (list, tuple)):
@@ -238,8 +238,8 @@ def email(self, comment, content_object, request):
return
recipient_list = [manager_tuple[1] for manager_tuple in settings.MANAGERS]
t = loader.get_template('comments/comment_notification_email.txt')
- c = Context({ 'comment': comment,
- 'content_object': content_object })
+ c = Context({'comment': comment,
+ 'content_object': content_object})
subject = '[%s] New comment posted on "%s"' % (get_current_site(request).name,
content_object)
message = t.render(c)
@@ -32,7 +32,7 @@ def get_postgis_types(self):
try:
cursor.execute(oid_sql, ('geometry',))
GEOM_TYPE = cursor.fetchone()[0]
- postgis_types = { GEOM_TYPE : 'GeometryField' }
+ postgis_types = {GEOM_TYPE : 'GeometryField'}
if self.connection.ops.geography:
cursor.execute(oid_sql, ('geography',))
GEOG_TYPE = cursor.fetchone()[0]
@@ -226,8 +226,8 @@ def get_select_format(self, fld):
# transformed geometries have an SRID different than that of the
# field -- this is only used by `transform` for Oracle and
# SpatiaLite backends.
- if self.query.transformed_srid and ( self.connection.ops.oracle or
- self.connection.ops.spatialite ):
+ if self.query.transformed_srid and (self.connection.ops.oracle or
+ self.connection.ops.spatialite):
sel_fmt = "'SRID=%d;'||%s" % (self.query.transformed_srid, sel_fmt)
else:
sel_fmt = '%s'
@@ -36,8 +36,8 @@ class GeoWhereNode(WhereNode):
def _prepare_data(self, data):
if isinstance(data, (list, tuple)):
obj, lookup_type, value = data
- if ( isinstance(obj, Constraint) and
- isinstance(obj.field, GeometryField) ):
+ if (isinstance(obj, Constraint) and
+ isinstance(obj.field, GeometryField)):
data = (GeoConstraint(obj), lookup_type, value)
return super(GeoWhereNode, self)._prepare_data(data)
@@ -19,15 +19,16 @@ class OGRIndexError(OGRException, KeyError):
#### OGR error checking codes and routine ####
# OGR Error Codes
-OGRERR_DICT = { 1 : (OGRException, 'Not enough data.'),
- 2 : (OGRException, 'Not enough memory.'),
- 3 : (OGRException, 'Unsupported geometry type.'),
- 4 : (OGRException, 'Unsupported operation.'),
- 5 : (OGRException, 'Corrupt data.'),
- 6 : (OGRException, 'OGR failure.'),
- 7 : (SRSException, 'Unsupported SRS.'),
- 8 : (OGRException, 'Invalid handle.'),
- }
+OGRERR_DICT = {
+ 1: (OGRException, 'Not enough data.'),
+ 2: (OGRException, 'Not enough memory.'),
+ 3: (OGRException, 'Unsupported geometry type.'),
+ 4: (OGRException, 'Unsupported operation.'),
+ 5: (OGRException, 'Corrupt data.'),
+ 6: (OGRException, 'OGR failure.'),
+ 7: (SRSException, 'Unsupported SRS.'),
+ 8: (OGRException, 'Invalid handle.'),
+}
OGRERR_NONE = 0
def check_err(code):
@@ -178,17 +178,18 @@ class OFTStringList(Field): pass
class OFTWideStringList(Field): pass
# Class mapping dictionary for OFT Types and reverse mapping.
-OGRFieldTypes = { 0 : OFTInteger,
- 1 : OFTIntegerList,
- 2 : OFTReal,
- 3 : OFTRealList,
- 4 : OFTString,
- 5 : OFTStringList,
- 6 : OFTWideString,
- 7 : OFTWideStringList,
- 8 : OFTBinary,
- 9 : OFTDate,
- 10 : OFTTime,
- 11 : OFTDateTime,
- }
+OGRFieldTypes = {
+ 0: OFTInteger,
+ 1: OFTIntegerList,
+ 2: OFTReal,
+ 3: OFTRealList,
+ 4: OFTString,
+ 5: OFTStringList,
+ 6: OFTWideString,
+ 7: OFTWideStringList,
+ 8: OFTBinary,
+ 9: OFTDate,
+ 10: OFTTime,
+ 11: OFTDateTime,
+}
ROGRFieldTypes = dict((cls, num) for num, cls in OGRFieldTypes.items())
@@ -151,8 +151,8 @@ def __setstate__(self, state):
def from_bbox(cls, bbox):
"Constructs a Polygon from a bounding box (4-tuple)."
x0, y0, x1, y1 = bbox
- return OGRGeometry( 'POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))' % (
- x0, y0, x0, y1, x1, y1, x1, y0, x0, y0) )
+ return OGRGeometry('POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))' % (
+ x0, y0, x0, y1, x1, y1, x1, y0, x0, y0))
### Geometry set-like operations ###
# g = g1 | g2
@@ -205,7 +205,7 @@ def test07a_polygons(self):
# Testing `from_bbox` class method
bbox = (-180, -90, 180, 90)
- p = OGRGeometry.from_bbox( bbox )
+ p = OGRGeometry.from_bbox(bbox)
self.assertEqual(bbox, p.extent)
prev = OGRGeometry('POINT(0 0)')
@@ -22,9 +22,10 @@ class GeoIPRecord(Structure):
('continent_code', c_char_p),
]
geoip_char_fields = [name for name, ctype in GeoIPRecord._fields_ if ctype is c_char_p]
-geoip_encodings = { 0: 'iso-8859-1',
- 1: 'utf8',
- }
+geoip_encodings = {
+ 0: 'iso-8859-1',
+ 1: 'utf8',
+}
class GeoIPTag(Structure): pass
@@ -96,9 +96,9 @@ def __delitem__(self, index):
indexRange = range(*index.indices(origLen))
newLen = origLen - len(indexRange)
- newItems = ( self._get_single_internal(i)
+ newItems = (self._get_single_internal(i)
for i in xrange(origLen)
- if i not in indexRange )
+ if i not in indexRange)
self._rebuild(newLen, newItems)
@@ -116,7 +116,7 @@ def setfcn(x,i,j,k,L): x[i:j:k] = range(L)
self.assertEqual(pl, ul[:], 'set slice [%d:%d]' % (i, j))
for k in self.step_range():
- ssl = nextRange( len(ul[i:j:k]) )
+ ssl = nextRange(len(ul[i:j:k]))
ul[i:j:k] = ssl
pl[i:j:k] = ssl
self.assertEqual(pl, ul[:], 'set slice [%d:%d:%d]' % (i, j, k))
@@ -127,12 +127,12 @@ def setfcn(x,i,j,k,L): x[i:j:k] = range(L)
self.assertRaises(ValueError, setfcn, ul, i, j, k, sliceLen - 1)
for k in self.step_range():
- ssl = nextRange( len(ul[i::k]) )
+ ssl = nextRange(len(ul[i::k]))
ul[i::k] = ssl
pl[i::k] = ssl
self.assertEqual(pl, ul[:], 'set slice [%d::%d]' % (i, k))
- ssl = nextRange( len(ul[:i:k]) )
+ ssl = nextRange(len(ul[:i:k]))
ul[:i:k] = ssl
pl[:i:k] = ssl
self.assertEqual(pl, ul[:], 'set slice [:%d:%d]' % (i, k))
@@ -95,7 +95,7 @@ def pixel_to_lonlat(self, px, zoom):
lon = (px[0] - npix) / self._degpp[zoom]
# Calculating the latitude value.
- lat = RTOD * ( 2 * atan(exp((px[1] - npix)/ (-1.0 * self._radpp[zoom]))) - 0.5 * pi)
+ lat = RTOD * (2 * atan(exp((px[1] - npix)/ (-1.0 * self._radpp[zoom]))) - 0.5 * pi)
# Returning the longitude, latitude coordinate pair.
return (lon, lat)
@@ -140,7 +140,7 @@ def test_distance_geodetic(self):
# Testing geodetic distance calculation with a non-point geometry
# (a LineString of Wollongong and Shellharbour coords).
- ls = LineString( ( (150.902, -34.4245), (150.87, -34.5789) ) )
+ ls = LineString(((150.902, -34.4245), (150.87, -34.5789)))
if oracle or connection.ops.geography:
# Reference query:
# SELECT ST_distance_sphere(point, ST_GeomFromText('LINESTRING(150.9020 -34.4245,150.8700 -34.5789)', 4326)) FROM distapp_australiacity ORDER BY name;
@@ -46,7 +46,7 @@
interstate_data = (
('I-45',
'LINESTRING(-95.3708481 29.7765870 11.339,-95.3694580 29.7787980 4.536,-95.3690305 29.7797359 9.762,-95.3691886 29.7812450 12.448,-95.3696447 29.7850144 10.457,-95.3702511 29.7868518 9.418,-95.3706724 29.7881286 14.858,-95.3711632 29.7896157 15.386,-95.3714525 29.7936267 13.168,-95.3717848 29.7955007 15.104,-95.3717719 29.7969804 16.516,-95.3717305 29.7982117 13.923,-95.3717254 29.8000778 14.385,-95.3719875 29.8013539 15.160,-95.3720575 29.8026785 15.544,-95.3721321 29.8040912 14.975,-95.3722074 29.8050998 15.688,-95.3722779 29.8060430 16.099,-95.3733818 29.8076750 15.197,-95.3741563 29.8103686 17.268,-95.3749458 29.8129927 19.857,-95.3763564 29.8144557 15.435)',
- ( 11.339, 4.536, 9.762, 12.448, 10.457, 9.418, 14.858,
+ (11.339, 4.536, 9.762, 12.448, 10.457, 9.418, 14.858,
15.386, 13.168, 15.104, 16.516, 13.923, 14.385, 15.16 ,
15.544, 14.975, 15.688, 16.099, 15.197, 17.268, 19.857,
15.435),
@@ -459,12 +459,14 @@ def test_extent(self):
@no_spatialite
def test_force_rhr(self):
"Testing GeoQuerySet.force_rhr()."
- rings = ( ( (0, 0), (5, 0), (0, 5), (0, 0) ),
- ( (1, 1), (1, 3), (3, 1), (1, 1) ),
- )
- rhr_rings = ( ( (0, 0), (0, 5), (5, 0), (0, 0) ),
- ( (1, 1), (3, 1), (1, 3), (1, 1) ),
- )
+ rings = (
+ ((0, 0), (5, 0), (0, 5), (0, 0)),
+ ((1, 1), (1, 3), (3, 1), (1, 1)),
+ )
+ rhr_rings = (
+ ((0, 0), (0, 5), (5, 0), (0, 0)),
+ ((1, 1), (3, 1), (1, 3), (1, 1)),
+ )
State.objects.create(name='Foo', poly=Polygon(*rings))
s = State.objects.force_rhr().get(name='Foo')
self.assertEqual(rhr_rings, s.force_rhr.coords)
@@ -648,7 +650,7 @@ def test_point_on_surface(self):
@no_spatialite
def test_reverse_geom(self):
"Testing GeoQuerySet.reverse_geom()."
- coords = [ (-95.363151, 29.763374), (-95.448601, 29.713803) ]
+ coords = [(-95.363151, 29.763374), (-95.448601, 29.713803)]
Track.objects.create(name='Foo', line=LineString(coords))
t = Track.objects.reverse_geom().get(name='Foo')
coords.reverse()
@@ -31,7 +31,7 @@ def _get_val():
return smart_text(token)
_get_val = lazy(_get_val, six.text_type)
- return {'csrf_token': _get_val() }
+ return {'csrf_token': _get_val()}
def debug(request):
"Returns context variables helpful for debugging."
@@ -32,7 +32,7 @@ def safeRef(target, onDelete = None):
if callable(onDelete):
return weakref.ref(target, onDelete)
else:
- return weakref.ref( target )
+ return weakref.ref(target)
class BoundMethodWeakref(object):
"""'Safe' and reusable weak references to instance methods
@@ -70,7 +70,7 @@ class BoundMethodWeakref(object):
_allInstances = weakref.WeakValueDictionary()
- def __new__( cls, target, onDelete=None, *arguments,**named ):
+ def __new__(cls, target, onDelete=None, *arguments,**named):
"""Create new instance or return current instance
Basically this method of construction allows us to
@@ -85,12 +85,12 @@ def __new__( cls, target, onDelete=None, *arguments,**named ):
key = cls.calculateKey(target)
current =cls._allInstances.get(key)
if current is not None:
- current.deletionMethods.append( onDelete)
+ current.deletionMethods.append(onDelete)
return current
else:
- base = super( BoundMethodWeakref, cls).__new__( cls )
+ base = super(BoundMethodWeakref, cls).__new__(cls)
cls._allInstances[key] = base
- base.__init__( target, onDelete, *arguments,**named)
+ base.__init__(target, onDelete, *arguments,**named)
return base
def __init__(self, target, onDelete=None):
@@ -112,13 +112,13 @@ def remove(weak, self=self):
methods = self.deletionMethods[:]
del self.deletionMethods[:]
try:
- del self.__class__._allInstances[ self.key ]
+ del self.__class__._allInstances[self.key]
except KeyError:
pass
for function in methods:
try:
- if callable( function ):
- function( self )
+ if callable(function):
+ function(self)
except Exception as e:
try:
traceback.print_exc()
@@ -127,20 +127,20 @@ def remove(weak, self=self):
self, function, e)
)
self.deletionMethods = [onDelete]
- self.key = self.calculateKey( target )
+ self.key = self.calculateKey(target)
self.weakSelf = weakref.ref(target.__self__, remove)
self.weakFunc = weakref.ref(target.__func__, remove)
self.selfName = str(target.__self__)
self.funcName = str(target.__func__.__name__)
- def calculateKey( cls, target ):
+ def calculateKey(cls, target):
"""Calculate the reference key for this reference
Currently this is a two-tuple of the id()'s of the
target object and the target function respectively.
"""
return (id(target.__self__),id(target.__func__))
- calculateKey = classmethod( calculateKey )
+ calculateKey = classmethod(calculateKey)
def __str__(self):
"""Give a friendly representation of the object"""
@@ -155,7 +155,7 @@ def __str__(self):
def __hash__(self):
return hash(self.key)
- def __bool__( self ):
+ def __bool__(self):
"""Whether we are still a valid reference"""
return self() is not None
@@ -36,7 +36,7 @@ def __init__(self, lexer):
self.command_stack = []
def enter_command(self, command, token):
- self.command_stack.append( (command, token.source) )
+ self.command_stack.append((command, token.source))
def exit_command(self):
self.command_stack.pop()
@@ -613,10 +613,10 @@ def parse(self, string, name='<string>'):
self._parse_example(m, name, lineno)
# Create an Example, and add it to the list.
if not self._IS_BLANK_OR_COMMENT(source):
- output.append( Example(source, want, exc_msg,
+ output.append(Example(source, want, exc_msg,
lineno=lineno,
indent=min_indent+len(m.group('indent')),
- options=options) )
+ options=options))
# Update lineno (lines inside this example)
lineno += string.count('\n', m.start(), m.end())
# Update charno.
@@ -1498,7 +1498,7 @@ def summarize(self, verbose=None):
if t == 0:
notests.append(name)
elif f == 0:
- passed.append( (name, t) )
+ passed.append((name, t))
else:
failed.append(x)
if verbose:
Oops, something went wrong. Retry.

0 comments on commit 83b9bfe

Please sign in to comment.