mirror of
https://github.com/django/django.git
synced 2024-12-22 17:16:24 +00:00
Start attacking E231 violations
This commit is contained in:
Alex Gaynor
parent
382d324ccc
commit
9bf5610890
@ -286,7 +286,7 @@ class GeoQuerySet(QuerySet):
|
||||
Reverses the coordinate order of the geometry, and attaches as a
|
||||
`reverse` attribute on each element of this GeoQuerySet.
|
||||
"""
|
||||
s = {'select_field' : GeomField(),}
|
||||
s = {'select_field': GeomField()}
|
||||
kwargs.setdefault('model_att', 'reverse_geom')
|
||||
if connections[self.db].ops.oracle:
|
||||
s['geo_field_type'] = LineStringField
|
||||
@ -733,7 +733,7 @@ class GeoQuerySet(QuerySet):
|
||||
DRY routine for setting up a GeoQuerySet method that attaches a
|
||||
Geometry attribute (e.g., `centroid`, `point_on_surface`).
|
||||
"""
|
||||
s = {'select_field' : GeomField(),}
|
||||
s = {'select_field': GeomField()}
|
||||
if connections[self.db].ops.oracle:
|
||||
s['procedure_fmt'] = '%(geo_col)s,%(tolerance)s'
|
||||
s['procedure_args'] = {'tolerance' : tolerance}
|
||||
|
||||
@ -12,7 +12,7 @@ if HAS_GDAL:
|
||||
# List of acceptable data sources.
|
||||
ds_list = (
|
||||
TestDS('test_point', nfeat=5, nfld=3, geom='POINT', gtype=1, driver='ESRI Shapefile',
|
||||
fields={'dbl' : OFTReal, 'int' : OFTInteger, 'str' : OFTString,},
|
||||
fields={'dbl': OFTReal, 'int': OFTInteger, 'str': OFTString},
|
||||
extent=(-1.35011, 0.166623, -0.524093, 0.824508), # Got extent from QGIS
|
||||
srs_wkt='GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]',
|
||||
field_values={'dbl': [float(i) for i in range(1, 6)], 'int': list(range(1, 6)), 'str': [str(i) for i in range(1, 6)]},
|
||||
@ -24,7 +24,7 @@ if HAS_GDAL:
|
||||
fids=range(1, 4)),
|
||||
TestDS('test_poly', nfeat=3, nfld=3, geom='POLYGON', gtype=3,
|
||||
driver='ESRI Shapefile',
|
||||
fields={'float' : OFTReal, 'int' : OFTInteger, 'str' : OFTString,},
|
||||
fields={'float': OFTReal, 'int': OFTInteger, 'str': OFTString},
|
||||
extent=(-1.01513, -0.558245, 0.161876, 0.839637), # Got extent from QGIS
|
||||
srs_wkt='GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]'),
|
||||
)
|
||||
|
||||
@ -24,13 +24,13 @@ srlist = (TestSRS('GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,29
|
||||
TestSRS('PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","32140"]]',
|
||||
proj=None, epsg=32140, projected=True, geographic=False, local=False,
|
||||
lin_name='metre', ang_name='degree', lin_units=1.0, ang_units=0.0174532925199,
|
||||
auth={'PROJCS' : ('EPSG', '32140'), 'spheroid' : ('EPSG', '7019'), 'unit' : ('EPSG', '9001'),},
|
||||
auth={'PROJCS': ('EPSG', '32140'), 'spheroid': ('EPSG', '7019'), 'unit': ('EPSG', '9001')},
|
||||
attr=(('DATUM', 'North_American_Datum_1983'), (('SPHEROID', 2), '298.257222101'), ('PROJECTION', 'Lambert_Conformal_Conic_2SP'),),
|
||||
),
|
||||
TestSRS('PROJCS["NAD_1983_StatePlane_Texas_South_Central_FIPS_4204_Feet",GEOGCS["GCS_North_American_1983",DATUM["North_American_Datum_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["False_Easting",1968500.0],PARAMETER["False_Northing",13123333.33333333],PARAMETER["Central_Meridian",-99.0],PARAMETER["Standard_Parallel_1",28.38333333333333],PARAMETER["Standard_Parallel_2",30.28333333333334],PARAMETER["Latitude_Of_Origin",27.83333333333333],UNIT["Foot_US",0.3048006096012192]]',
|
||||
proj=None, epsg=None, projected=True, geographic=False, local=False,
|
||||
lin_name='Foot_US', ang_name='Degree', lin_units=0.3048006096012192, ang_units=0.0174532925199,
|
||||
auth={'PROJCS' : (None, None),},
|
||||
auth={'PROJCS': (None, None)},
|
||||
attr=(('PROJCS|GeOgCs|spheroid', 'GRS_1980'), (('projcs', 9), 'UNIT'), (('projcs', 11), None),),
|
||||
),
|
||||
# This is really ESRI format, not WKT -- but the import should work the same
|
||||
|
||||
@ -11,9 +11,11 @@ from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUpload
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
from django.utils.module_loading import import_by_path
|
||||
|
||||
__all__ = ['UploadFileException','StopUpload', 'SkipFile', 'FileUploadHandler',
|
||||
'TemporaryFileUploadHandler', 'MemoryFileUploadHandler',
|
||||
'load_handler', 'StopFutureHandlers']
|
||||
__all__ = [
|
||||
'UploadFileException', 'StopUpload', 'SkipFile', 'FileUploadHandler',
|
||||
'TemporaryFileUploadHandler', 'MemoryFileUploadHandler', 'load_handler',
|
||||
'StopFutureHandlers'
|
||||
]
|
||||
|
||||
class UploadFileException(Exception):
|
||||
"""
|
||||
|
||||
@ -129,9 +129,9 @@ class GenericIPAddressFieldTests(ValidationTestCase):
|
||||
|
||||
def test_invalid_v4_ip_raises_error(self):
|
||||
giptm = GenericIPAddressTestModel(v4_ip="294.4.2.1")
|
||||
self.assertFailsValidation(giptm.full_clean, ['v4_ip',])
|
||||
self.assertFailsValidation(giptm.full_clean, ['v4_ip'])
|
||||
giptm = GenericIPAddressTestModel(v4_ip="2001::2")
|
||||
self.assertFailsValidation(giptm.full_clean, ['v4_ip',])
|
||||
self.assertFailsValidation(giptm.full_clean, ['v4_ip'])
|
||||
|
||||
def test_correct_v6_ip_passes(self):
|
||||
giptm = GenericIPAddressTestModel(v6_ip="2001::2")
|
||||
@ -139,16 +139,16 @@ class GenericIPAddressFieldTests(ValidationTestCase):
|
||||
|
||||
def test_invalid_v6_ip_raises_error(self):
|
||||
giptm = GenericIPAddressTestModel(v6_ip="1.2.3.4")
|
||||
self.assertFailsValidation(giptm.full_clean, ['v6_ip',])
|
||||
self.assertFailsValidation(giptm.full_clean, ['v6_ip'])
|
||||
giptm = GenericIPAddressTestModel(v6_ip="1:2")
|
||||
self.assertFailsValidation(giptm.full_clean, ['v6_ip',])
|
||||
self.assertFailsValidation(giptm.full_clean, ['v6_ip'])
|
||||
|
||||
def test_v6_uniqueness_detection(self):
|
||||
# These two addresses are the same with different syntax
|
||||
giptm = GenericIPAddressTestModel(generic_ip="2001::1:0:0:0:0:2")
|
||||
giptm.save()
|
||||
giptm = GenericIPAddressTestModel(generic_ip="2001:0:1:2")
|
||||
self.assertFailsValidation(giptm.full_clean, ['generic_ip',])
|
||||
self.assertFailsValidation(giptm.full_clean, ['generic_ip'])
|
||||
|
||||
def test_v4_unpack_uniqueness_detection(self):
|
||||
# These two are different, because we are not doing IPv4 unpacking
|
||||
|
||||
Loading…
Reference in New Issue
Block a user