--- a/script/lib/iri_tweet/iri_tweet/utils.py	Mon Dec 17 00:41:54 2012 +0100
+++ b/script/lib/iri_tweet/iri_tweet/utils.py	Mon Dec 17 01:06:27 2012 +0100
@@ -48,7 +48,7 @@
 
     if res is None:
         get_logger().debug("get_oauth_token : doing the oauth dance")
-        res = twitter.oauth_dance.oauth_dance(application_name, consumer_key, consumer_secret, token_file_path)
+        res = twitter.oauth_dance(application_name, consumer_key, consumer_secret, token_file_path)
     
     CACHE_ACCESS_TOKEN[application_name] = res
     
@@ -274,13 +274,13 @@
         else:        
             return self.obj_buffer.add_object(User, None, user_dict, True)        
 
-    def __get_or_create_object(self, klass, filter_by_kwargs, filter, creation_kwargs, must_flush, do_merge):
+    def __get_or_create_object(self, klass, filter_by_kwargs, filter_arg, creation_kwargs, must_flush, do_merge):
         
         obj_proxy = self.obj_buffer.get(klass, **filter_by_kwargs)
         if obj_proxy is None:
             query = self.session.query(klass)
-            if filter is not None:
-                query = query.filter(filter)
+            if filter_arg is not None:
+                query = query.filter(filter_arg)
             else:
                 query = query.filter_by(**filter_by_kwargs)
             obj_instance = query.first()