From aaa8795863922fdab5fbfc66449f03179f3aa6a6 Mon Sep 17 00:00:00 2001 From: Mark McClain Date: Mon, 6 Dec 2010 14:20:42 -0500 Subject: [PATCH] changed the __iter__ be an item iterator instrea of a key iterator --- pecan/configuration.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pecan/configuration.py b/pecan/configuration.py index 3688321..e5613ab 100755 --- a/pecan/configuration.py +++ b/pecan/configuration.py @@ -10,7 +10,13 @@ class Config(object): def update(self, conf_dict): # first check the keys for correct - for k in conf_dict: + + if isinstance(conf_dict, dict): + iterator = conf_dict.iteritems() + else: + iterator = iter(conf_dict) + + for k,v in iterator: if not IDENTIFIER.match(k): raise ValueError('\'%s\' is not a valid indentifier' % k) @@ -31,7 +37,7 @@ class Config(object): self.__dict__[key] = value def __iter__(self): - return self.__dict__.__iter__() + return self.__dict__.iteritems() def __dir__(self): return self.__dict__.keys()