Skip to content

Commit

Permalink
Fix small style issues picked up by the new pycodestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
omad committed Apr 11, 2018
1 parent f418ee4 commit b6ca351
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions integration_tests/test_config_tool.py
Expand Up @@ -80,9 +80,9 @@ def test_config_check(clirunner, initialised_postgres_db, local_config):
]
)

host_regex = re.compile('.*Host:\s+{}.*'.format(local_config['db_hostname']),
host_regex = re.compile(r'.*Host:\s+{}.*'.format(local_config['db_hostname']),
flags=re.DOTALL) # Match across newlines
user_regex = re.compile('.*User:\s+{}.*'.format(local_config['db_username']),
user_regex = re.compile(r'.*User:\s+{}.*'.format(local_config['db_username']),
flags=re.DOTALL)
assert host_regex.match(result.output)
assert user_regex.match(result.output)
Expand Down
12 changes: 8 additions & 4 deletions tests/test_geometry.py
Expand Up @@ -183,8 +183,10 @@ def test_unary_intersection():

class TestCRSEqualityComparisons(object):
def test_sinusoidal_comparison(self):
a = geometry.CRS("""PROJCS["unnamed",GEOGCS["Unknown datum based upon the custom spheroid",
DATUM["Not specified (based on custom spheroid)",SPHEROID["Custom spheroid",6371007.181,0]],
a = geometry.CRS("""PROJCS["unnamed",
GEOGCS["Unknown datum based upon the custom spheroid",
DATUM["Not specified (based on custom spheroid)",
SPHEROID["Custom spheroid",6371007.181,0]],
PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Sinusoidal"],
PARAMETER["longitude_of_center",0],PARAMETER["false_easting",0],
PARAMETER["false_northing",0],UNIT["Meter",1]]""")
Expand All @@ -201,8 +203,10 @@ def test_sinusoidal_comparison(self):
assert a != geometry.CRS('EPSG:4326')

def test_grs80_comparison(self):
a = geometry.CRS("""GEOGCS["GEOCENTRIC DATUM of AUSTRALIA",DATUM["GDA94",SPHEROID["GRS80",6378137,298.257222101]],
PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]""")
a = geometry.CRS("""GEOGCS["GEOCENTRIC DATUM of AUSTRALIA",
DATUM["GDA94",SPHEROID["GRS80",6378137,298.257222101]],
PRIMEM["Greenwich",0],
UNIT["degree",0.0174532925199433]]""")
b = geometry.CRS("""GEOGCS["GRS 1980(IUGG, 1980)",DATUM["unknown",SPHEROID["GRS80",6378137,298.257222101]],
PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]""")
c = geometry.CRS('+proj=longlat +no_defs +ellps=GRS80')
Expand Down

0 comments on commit b6ca351

Please sign in to comment.