Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Travis test matrix and supported compatibility table #212

Merged
merged 9 commits into from
Feb 25, 2019
Prev Previous commit
Next Next commit
A few lint fixes
blag committed Feb 24, 2019

Unverified

No user is associated with the committer email.
commit 1b48090ba28d3038d79e589af627925c1a15cd4e
8 changes: 4 additions & 4 deletions cities/management/commands/cities.py
Original file line number Diff line number Diff line change
@@ -118,7 +118,7 @@ def add_arguments(self, parser):
metavar="DATA_TYPES",
default='all',
dest="import",
help='Selectively import data. Comma separated list of data ' +
help='Selectively import data. Comma separated list of data '
'types: ' + str(import_opts).replace("'", '')
)
parser.add_argument(
@@ -752,7 +752,7 @@ def import_alt_name(self):
geo_info['type'].__name__,
item['name']))
continue
alt.is_historic = True if ((item['isHistoric']and
alt.is_historic = True if ((item['isHistoric'] and
item['isHistoric'] != '\n') or
locale == 'fr_1793') else False

@@ -789,8 +789,8 @@ def import_alt_name(self):
continue

if hasattr(alt, 'kind'):
if (locale in ('abbr', 'link', 'name') or
INCLUDE_AIRPORT_CODES and locale in ('iana', 'icao', 'faac')):
if locale in ('abbr', 'link', 'name') or \
INCLUDE_AIRPORT_CODES and locale in ('iana', 'icao', 'faac'):
alt.kind = locale
elif locale not in settings.locales and 'all' not in settings.locales:
self.logger.debug("Unknown alternative name type: {} -- skipping".format(locale))