From 956601b5d0c8f3059b84657224f8b0d8f11e4f76 Mon Sep 17 00:00:00 2001 From: Matthew Tretter Date: Mon, 3 Dec 2012 22:48:14 -0500 Subject: [PATCH] Revert register.spec argument order Since we got rid of inner Config classes, we can put the order back and support decorators. --- imagekit/registry.py | 6 +++--- imagekit/specs/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imagekit/registry.py b/imagekit/registry.py index 5961298..a547c69 100644 --- a/imagekit/registry.py +++ b/imagekit/registry.py @@ -13,7 +13,7 @@ class GeneratorRegistry(object): def __init__(self): self._generators = {} - def register(self, generator, id): + def register(self, id, generator): if id in self._generators: raise AlreadyRegistered('The spec or generator with id %s is' ' already registered' % id) @@ -116,8 +116,8 @@ class Register(object): Register specs and sources. """ - def spec(self, spec, id=None): - generator_registry.register(spec, id) + def spec(self, id, spec): + generator_registry.register(id, spec) def sources(self, spec_id, sources): source_group_registry.register(spec_id, sources) diff --git a/imagekit/specs/__init__.py b/imagekit/specs/__init__.py index 581453d..906f210 100644 --- a/imagekit/specs/__init__.py +++ b/imagekit/specs/__init__.py @@ -185,7 +185,7 @@ class SpecHost(object): """ self.spec_id = id - register.spec(self._original_spec, id) + register.spec(id, self._original_spec) def get_spec(self, **kwargs): """