--- a/script/lib/iri_tweet/iri_tweet/models.py Tue May 07 18:57:54 2013 +0200
+++ b/script/lib/iri_tweet/iri_tweet/models.py Tue May 07 19:33:35 2013 +0200
@@ -31,7 +31,7 @@
def __init__(cls, name, bases, ns): #@NoSelf
def init(self, **kwargs):
- for key, value in kwargs.items():
+ for key, value in kwargs.iteritems():
if hasattr(self, key):
setattr(self, key, value)
super(cls, self).__init__()
@@ -274,7 +274,7 @@
session_argname = [ 'autoflush','binds', "class_", "_enable_transaction_accounting","expire_on_commit", "extension", "query_cls", "twophase", "weak_identity_map", "autocommit"]
- kwargs_ce = dict((k, v) for k,v in kwargs.items() if (k not in session_argname and k != "create_all"))
+ kwargs_ce = dict((k, v) for k,v in kwargs.iteritems() if (k not in session_argname and k != "create_all"))
engine = create_engine(*args, **kwargs_ce)
--- a/script/lib/iri_tweet/iri_tweet/processor.py Tue May 07 18:57:54 2013 +0200
+++ b/script/lib/iri_tweet/iri_tweet/processor.py Tue May 07 19:33:35 2013 +0200
@@ -255,7 +255,7 @@
def __process_entities(self):
if "entities" in self.json_dict:
- for ind_type, entity_list in self.json_dict["entities"].items():
+ for ind_type, entity_list in self.json_dict["entities"].iteritems():
for ind in entity_list:
self.__process_entity(ind, ind_type)
else:
--- a/script/lib/iri_tweet/iri_tweet/utils.py Tue May 07 18:57:54 2013 +0200
+++ b/script/lib/iri_tweet/iri_tweet/utils.py Tue May 07 19:33:35 2013 +0200
@@ -59,7 +59,7 @@
return datetime.datetime(*ts[0:7])
def clean_keys(dict_val):
- return dict([(str(key),value) for key,value in dict_val.items()])
+ return dict([(str(key),value) for key,value in dict_val.iteritems()])
fields_adapter = {
'stream': {
@@ -100,7 +100,7 @@
return adapter_mapping[field](value)
else:
return value
- return dict([(str(k),adapt_one_field(k,v)) for k,v in fields_dict.items()])
+ return dict([(str(k),adapt_one_field(k,v)) for k,v in fields_dict.iteritems()])
class ObjectBufferProxy(object):
@@ -113,7 +113,7 @@
def persists(self, session):
new_args = [arg() if callable(arg) else arg for arg in self.args] if self.args is not None else []
- new_kwargs = dict([(k,v()) if callable(v) else (k,v) for k,v in self.kwargs.items()]) if self.kwargs is not None else {}
+ new_kwargs = dict([(k,v()) if callable(v) else (k,v) for k,v in self.kwargs.iteritems()]) if self.kwargs is not None else {}
if self.instance is None:
self.instance = self.klass(*new_args, **new_kwargs)
@@ -160,7 +160,7 @@
if proxy.kwargs is None or len(proxy.kwargs) == 0 or proxy.klass != klass:
continue
found = True
- for k,v in kwargs.items():
+ for k,v in kwargs.iteritems():
if (k not in proxy.kwargs) or v != proxy.kwargs[k]:
found = False
break
--- a/script/lib/iri_tweet/setup.py Tue May 07 18:57:54 2013 +0200
+++ b/script/lib/iri_tweet/setup.py Tue May 07 19:33:35 2013 +0200
@@ -45,7 +45,7 @@
if line.strip() == '# -eof meta-':
break
acc.append(line)
- for pattern, handler in pats.items():
+ for pattern, handler in pats.iteritems():
m = pattern.match(line.strip())
if m:
meta.update(handler(m))