Skip to content

Commit

Permalink
Merge pull request #264 from sbrunner/autofix/wrapped2_to3_fix
Browse files Browse the repository at this point in the history
Fix "Avoid mutable default arguments" issue
  • Loading branch information
sbrunner committed Jan 26, 2017
2 parents 66c3219 + d453e0f commit 723a823
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
8 changes: 6 additions & 2 deletions tilecloud_chain/__init__.py
Expand Up @@ -134,7 +134,9 @@ def get_tile_matrix_identifier(grid, resolution=None, zoom=None):

class TileGeneration:

def __init__(self, config_file, options=None, layer_name=None, base_config={}):
def __init__(self, config_file, options=None, layer_name=None, base_config=None):
if base_config is None:
base_config = {}
self.close_actions = []
self.geom = None
self.error = 0
Expand Down Expand Up @@ -432,8 +434,10 @@ def get_all_dimensions(self, layer=None):
all_dimensions = product(*all_dimensions)
return [dict(d) for d in all_dimensions]

def get_store(self, cache, layer, dimensions={}, read_only=False):
def get_store(self, cache, layer, dimensions=None, read_only=False):
# build layout
if dimensions is None: # pragma: no cover
dimensions = {}
grid = layer['grid_ref'] if 'grid_ref' in layer else None
layout = WMTSTileLayout(
layer=layer['name'],
Expand Down
4 changes: 3 additions & 1 deletion tilecloud_chain/copy_.py
Expand Up @@ -23,8 +23,10 @@ def copy(self, options, gene, layer, source, dest, task_name):
else: # pragma: no cover
self._copy(options, gene, layer, source, dest, task_name)

def _copy(self, options, gene, layer, source, dest, task_name, dimensions={}):
def _copy(self, options, gene, layer, source, dest, task_name, dimensions=None):
# disable metatiles
if dimensions is None: # pragma: no cover
dimensions = {}
del gene.layers[layer]['meta']
count_tiles_dropped = Count()

Expand Down
4 changes: 3 additions & 1 deletion tilecloud_chain/generate.py
Expand Up @@ -46,7 +46,9 @@ def gene(self, options, gene, layer):
else: # pragma: no cover
self._gene(options, gene, layer)

def _gene(self, options, gene, layer, dimensions={}):
def _gene(self, options, gene, layer, dimensions=None):
if dimensions is None: # pragma: no cover
dimensions = {}
count_metatiles = None
count_metatiles_dropped = Count()
count_tiles = None
Expand Down
12 changes: 9 additions & 3 deletions tilecloud_chain/server.py
Expand Up @@ -384,7 +384,9 @@ def serve(self, path, params, **kwargs):
else:
return self.error(204, **kwargs)

def forward(self, url, headers={}, no_cache=False, **kwargs):
def forward(self, url, headers=None, no_cache=False, **kwargs):
if headers is None:
headers = {}
if no_cache:
headers['Cache-Control'] = 'no-cache'
headers['Pragma'] = 'no-cache'
Expand Down Expand Up @@ -424,7 +426,9 @@ def error(self, code, message='', start_response=None):
start_response(self.HTTP_MESSAGES[code], [])
return [message]

def responce(self, data, headers={}, start_response=None):
def responce(self, data, headers=None, start_response=None):
if headers is None: # pragma: no cover
headers = {}
headers['Content-Length'] = str(len(data))
start_response('200 OK', headers.items())
return [data]
Expand Down Expand Up @@ -466,7 +470,9 @@ def __call__(self):
def error(self, code, message=''):
raise self.HTTP_EXCEPTIONS[code](message)

def responce(self, data, headers={}):
def responce(self, data, headers=None):
if headers is None: # pragma: no cover
headers = {}
self.request.response.headers = headers
if type(data) == memoryview:
self.request.response.body_file = data
Expand Down

0 comments on commit 723a823

Please sign in to comment.