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

Merge pull request #24 from julienmalik/fix_settings

Browse Source 
[fix] individual images can override global settings, not the other way around
This commit is contained in:
Laurent Peuch 2016-02-18 09:16:05 +01:00
commit d9aa086f2b
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):