prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] individual images can override global settings, not the other way around

Browse Source
This commit is contained in:
Julien Malik 2016-02-18 09:05:17 +01:00
parent 677cd14c7e
commit a818bf24fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prosopopee/prosopopee.py
View File

@ -30,8 +30,8 @@ class Image(object):
# assuming string # assuming string
if not isinstance(options, dict): if not isinstance(options, dict):
options = {"name": options} options = {"name": options}
self.options = options.copy() # used for caching, if it's modified -> regenerate self.options = SETTINGS["gm"].copy() # used for caching, if it's modified -> regenerate
self.options.update(SETTINGS["gm"]) self.options.update(options)
@property @property
def name(self): def name(self):