mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-17 07:19:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #28617 -- Made ogrinspect output pep8 compliant.

Browse Source
This commit is contained in:
Thomas Schorr 2017-09-19 09:41:40 +00:00 committed by Tim Graham
parent df41b5a05d
commit 52eb5b289e
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/gis/management/commands/ogrinspect.py
View File

@ -124,10 +124,10 @@ class Command(BaseCommand):
# This extra legwork is so that the dictionary definition comes # This extra legwork is so that the dictionary definition comes
# out in the same order as the fields in the model definition. # out in the same order as the fields in the model definition.
rev_mapping = {v: k for k, v in mapping_dict.items()} rev_mapping = {v: k for k, v in mapping_dict.items()}
output.extend(['', '# Auto-generated `LayerMapping` dictionary for %s model' % model_name, output.extend(['', '', '# Auto-generated `LayerMapping` dictionary for %s model' % model_name,
'%s_mapping = {' % model_name.lower()]) '%s_mapping = {' % model_name.lower()])
output.extend(" '%s' : '%s'," % ( output.extend(" '%s': '%s'," % (
rev_mapping[ogr_fld], ogr_fld) for ogr_fld in ds[options['layer_key']].fields rev_mapping[ogr_fld], ogr_fld) for ogr_fld in ds[options['layer_key']].fields
) )
output.extend([" '%s' : '%s'," % (options['geom_name'], mapping_dict[options['geom_name']]), '}']) output.extend([" '%s': '%s'," % (options['geom_name'], mapping_dict[options['geom_name']]), '}'])
return '\n'.join(output) + '\n' return '\n'.join(output) + '\n'

1
django/contrib/gis/utils/ogrinspect.py
View File

@ -169,6 +169,7 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non
yield '# This is an auto-generated Django model module created by ogrinspect.' yield '# This is an auto-generated Django model module created by ogrinspect.'
yield 'from django.contrib.gis.db import models' yield 'from django.contrib.gis.db import models'
yield '' yield ''
yield ''
yield 'class %s(models.Model):' % model_name yield 'class %s(models.Model):' % model_name

21
tests/gis_tests/inspectapp/tests.py
View File

@ -70,6 +70,7 @@ class OGRInspectTest(TestCase):
'# This is an auto-generated Django model module created by ogrinspect.', '# This is an auto-generated Django model module created by ogrinspect.',
'from django.contrib.gis.db import models', 'from django.contrib.gis.db import models',
'', '',
'',
'class MyModel(models.Model):', 'class MyModel(models.Model):',
' float = models.FloatField()', ' float = models.FloatField()',
' int = models.{}()'.format('BigIntegerField' if GDAL_VERSION >= (2, 0) else 'FloatField'), ' int = models.{}()'.format('BigIntegerField' if GDAL_VERSION >= (2, 0) else 'FloatField'),
@ -96,6 +97,7 @@ class OGRInspectTest(TestCase):
'# This is an auto-generated Django model module created by ogrinspect.', '# This is an auto-generated Django model module created by ogrinspect.',
'from django.contrib.gis.db import models', 'from django.contrib.gis.db import models',
'', '',
'',
'class City(models.Model):', 'class City(models.Model):',
' name = models.CharField(max_length=80)', ' name = models.CharField(max_length=80)',
' population = models.{}()'.format('BigIntegerField' if GDAL_VERSION >= (2, 0) else 'FloatField'), ' population = models.{}()'.format('BigIntegerField' if GDAL_VERSION >= (2, 0) else 'FloatField'),
@ -126,6 +128,7 @@ class OGRInspectTest(TestCase):
'# This is an auto-generated Django model module created by ogrinspect.\n' '# This is an auto-generated Django model module created by ogrinspect.\n'
'from django.contrib.gis.db import models\n' 'from django.contrib.gis.db import models\n'
'\n' '\n'
'\n'
'class Measurement(models.Model):\n' 'class Measurement(models.Model):\n'
)) ))
@ -148,6 +151,24 @@ class OGRInspectTest(TestCase):
output = out.getvalue() output = out.getvalue()
self.assertIn('class City(models.Model):', output) self.assertIn('class City(models.Model):', output)
def test_mapping_option(self):
expected = (
" geom = models.PointField(srid=-1)\n"
"\n"
"\n"
"# Auto-generated `LayerMapping` dictionary for City model\n"
"city_mapping = {\n"
" 'name': 'Name',\n"
" 'population': 'Population',\n"
" 'density': 'Density',\n"
" 'created': 'Created',\n"
" 'geom': 'POINT',\n"
"}\n")
shp_file = os.path.join(TEST_DATA, 'cities', 'cities.shp')
out = StringIO()
call_command('ogrinspect', shp_file, '--mapping', 'City', stdout=out)
self.assertIn(expected, out.getvalue())
def get_ogr_db_string(): def get_ogr_db_string():
""" """