Added contents of client.py into twitter session

src/controller/buffersController.py

@@ -174,10 +174,10 @@ class bufferController(object):
   media_ids = []
   for i in attachments:
    photo = open(i["file"], "rb")
-   img = self.session.twitter.twitter.upload_media(media=photo)
-   self.session.twitter.twitter.create_metadata(media_id=img["media_id"], alt_text=dict(text=i["description"]))
+   img = self.session.twitter.upload_media(media=photo)
+   self.session.twitter.create_metadata(media_id=img["media_id"], alt_text=dict(text=i["description"]))
    media_ids.append(img["media_id"])
-  self.session.twitter.twitter.update_status(status=text, media_ids=media_ids)
+  self.session.twitter.update_status(status=text, media_ids=media_ids)
 
  def save_positions(self):
   try:
@@ -290,7 +290,7 @@ class baseBufferController(bufferController):
   if tweet.has_key("message"):
    message = tweet["message"]
   try:
-   tweet = self.session.twitter.twitter.show_status(id=tweet_id, include_ext_alt_text=True, tweet_mode="extended")
+   tweet = self.session.twitter.show_status(id=tweet_id, include_ext_alt_text=True, tweet_mode="extended")
    urls = utils.find_urls_in_text(tweet["full_text"])
    for url in range(0, len(urls)):
     try:  tweet["full_text"] = tweet["full_text"].replace(urls[url], tweet["entities"]["urls"][url]["expanded_url"])
@@ -304,7 +304,7 @@ class baseBufferController(bufferController):
   while l != False:
    tweetsList.append(tweet)
    try:
-    tweet = self.session.twitter.twitter.show_status(id=l, include_ext_alt_text=True, tweet_mode="extended")
+    tweet = self.session.twitter.show_status(id=l, include_ext_alt_text=True, tweet_mode="extended")
     urls = utils.find_urls_in_text(tweet["full_text"])
     for url in range(0, len(urls)):
      try:  tweet["full_text"] = tweet["full_text"].replace(urls[url], tweet["entities"]["urls"][url]["expanded_url"])
@@ -719,10 +719,10 @@ class baseBufferController(bufferController):
   if answer == widgetUtils.YES:
    try:
     if self.name == "direct_messages" or self.name == "sent_direct_messages":
-     self.session.twitter.twitter.destroy_direct_message(id=self.get_right_tweet()["id"])
+     self.session.twitter.destroy_direct_message(id=self.get_right_tweet()["id"])
      self.session.db[self.name]["items"].pop(index)
     else:
-     self.session.twitter.twitter.destroy_status(id=self.get_right_tweet()["id"])
+     self.session.twitter.destroy_status(id=self.get_right_tweet()["id"])
      self.session.db[self.name].pop(index)
     self.buffer.list.remove_item(index)
 #    if index > 0:
@@ -745,7 +745,7 @@ class baseBufferController(bufferController):
 
  def get_quoted_tweet(self, tweet):
 #  try:
-  quoted_tweet = self.session.twitter.twitter.show_status(id=tweet["id"])
+  quoted_tweet = self.session.twitter.show_status(id=tweet["id"])
   urls = utils.find_urls_in_text(quoted_tweet["text"])
   for url in range(0, len(urls)):
    try:  quoted_tweet["text"] = quoted_tweet["text"].replace(urls[url], quoted_tweet["entities"]["urls"][url]["expanded_url"])
@@ -756,7 +756,7 @@ class baseBufferController(bufferController):
   l = tweets.is_long(quoted_tweet)
   id = tweets.get_id(l)
 #  try:
-  original_tweet = self.session.twitter.twitter.show_status(id=id)
+  original_tweet = self.session.twitter.show_status(id=id)
   urls = utils.find_urls_in_text(original_tweet["text"])
   for url in range(0, len(urls)):
    try:  original_tweet["text"] = original_tweet["text"].replace(urls[url], original_tweet["entities"]["urls"][url]["expanded_url"])
@@ -879,7 +879,7 @@ class listBufferController(baseBufferController):
  def get_user_ids(self):
   next_cursor = -1
   while(next_cursor):
-   users = self.session.twitter.twitter.get_list_members(list_id=self.list_id, cursor=next_cursor, include_entities=False, skip_status=True)
+   users = self.session.twitter.get_list_members(list_id=self.list_id, cursor=next_cursor, include_entities=False, skip_status=True)
    for i in users['users']:
     if i["id"] not in self.users:
      self.users.append(i["id"])
@@ -1408,7 +1408,7 @@ class conversationBufferController(searchBufferController):
     tweet = self.tweet
     while tweet["in_reply_to_status_id"] != None:
      try:
-      tweet = self.session.twitter.twitter.show_status(id=tweet["in_reply_to_status_id"], tweet_mode="extended")
+      tweet = self.session.twitter.show_status(id=tweet["in_reply_to_status_id"], tweet_mode="extended")
      except TwythonError as err:
       break
      self.statuses.insert(0, tweet)

src/controller/listsController.py

@@ -29,7 +29,7 @@ class listsController(object):
   return [compose.compose_list(item) for item in self.session.db["lists"]]
 
  def get_user_lists(self, user):
-  self.lists = self.session.twitter.twitter.show_lists(reverse=True, screen_name=user)
+  self.lists = self.session.twitter.show_lists(reverse=True, screen_name=user)
   return [compose.compose_list(item) for item in self.lists]
 
  def create_list(self, *args, **kwargs):
@@ -43,7 +43,7 @@ class listsController(object):
    else:
     mode = "private"
    try:
-    new_list = self.session.twitter.twitter.create_list(name=name, description=description, mode=mode)
+    new_list = self.session.twitter.create_list(name=name, description=description, mode=mode)
     self.session.db["lists"].append(new_list)
     self.dialog.lista.insert_item(False, *compose.compose_list(new_list))
    except TwythonError as e:
@@ -63,7 +63,7 @@ class listsController(object):
    else:
     mode = "private"
    try:
-    self.session.twitter.twitter.update_list(list_id=list["id"], name=name, description=description, mode=mode)
+    self.session.twitter.update_list(list_id=list["id"], name=name, description=description, mode=mode)
     self.session.get_lists()
     self.dialog.populate_list(self.get_all_lists(), True)
    except TwythonError as e:
@@ -75,7 +75,7 @@ class listsController(object):
   list = self.session.db["lists"][self.dialog.get_item()]["id"]
   if lists.remove_list() == widgetUtils.YES:
    try:
-    self.session.twitter.twitter.delete_list(list_id=list)
+    self.session.twitter.delete_list(list_id=list)
     self.session.db["lists"].pop(self.dialog.get_item())
     self.dialog.lista.remove_item(self.dialog.get_item())
    except TwythonError as e:
@@ -90,7 +90,7 @@ class listsController(object):
   if self.dialog.lista.get_count() == 0: return
   list_id = self.lists[self.dialog.get_item()]["id"]
   try:
-   list = self.session.twitter.twitter.subscribe_to_list(list_id=list_id)
+   list = self.session.twitter.subscribe_to_list(list_id=list_id)
    item = utils.find_item(list["id"], self.session.db["lists"])
    self.session.db["lists"].append(list)
   except TwythonError as e:
@@ -100,7 +100,7 @@ class listsController(object):
   if self.dialog.lista.get_count() == 0: return
   list_id = self.lists[self.dialog.get_item()]["id"]
   try:
-   list = self.session.twitter.twitter.unsubscribe_from_list(list_id=list_id)
+   list = self.session.twitter.unsubscribe_from_list(list_id=list_id)
    self.session.db["lists"].remove(list)
   except TwythonError as e:
    output.speak("error %s: %s" % (e.status_code, e.msg))

src/controller/mainController.py

@@ -553,7 +553,7 @@ class Controller(object):
   dlg.populate_list([compose.compose_list(item) for item in buff.session.db["lists"]])
   if dlg.get_response() == widgetUtils.OK:
    try:
-    list = buff.session.twitter.twitter.add_list_member(list_id=buff.session.db["lists"][dlg.get_item()]["id"], screen_name=user)
+    list = buff.session.twitter.add_list_member(list_id=buff.session.db["lists"][dlg.get_item()]["id"], screen_name=user)
     older_list = utils.find_item(buff.session.db["lists"][dlg.get_item()]["id"], buff.session.db["lists"])
     listBuffer = self.search_buffer("%s-list" % (buff.session.db["lists"][dlg.get_item()]["name"].lower()), buff.session.db["user_name"])
     if listBuffer != None: listBuffer.get_user_ids()
@@ -581,7 +581,7 @@ class Controller(object):
   dlg.populate_list([compose.compose_list(item) for item in buff.session.db["lists"]])
   if dlg.get_response() == widgetUtils.OK:
    try:
-    list = buff.session.twitter.twitter.delete_list_member(list_id=buff.session.db["lists"][dlg.get_item()]["id"], screen_name=user)
+    list = buff.session.twitter.delete_list_member(list_id=buff.session.db["lists"][dlg.get_item()]["id"], screen_name=user)
     older_list = utils.find_item(buff.session.db["lists"][dlg.get_item()]["id"], buff.session.db["lists"])
     listBuffer = self.search_buffer("%s-list" % (buff.session.db["lists"][dlg.get_item()]["name"].lower()), buff.session.db["user_name"])
     if listBuffer != None: listBuffer.get_user_ids()
@@ -781,7 +781,7 @@ class Controller(object):
    return
   else:
    id = buffer.get_tweet()["id"]
-   tweet = buffer.session.twitter.twitter.show_status(id=id, include_ext_alt_text=True, tweet_mode="extended")
+   tweet = buffer.session.twitter.show_status(id=id, include_ext_alt_text=True, tweet_mode="extended")
    if tweet["favorited"] == False:
     call_threaded(buffer.session.api_call, call_name="create_favorite", _sound="favourite.ogg", id=id)
    else:
@@ -816,7 +816,7 @@ class Controller(object):
    users = utils.get_all_users(tweet, buff.session.db)
   dlg = dialogs.userSelection.selectUserDialog(users=users, default=default)
   if dlg.get_response() == widgetUtils.OK:
-   usr = utils.if_user_exists(buff.session.twitter.twitter, dlg.get_user())
+   usr = utils.if_user_exists(buff.session.twitter, dlg.get_user())
    if usr != None:
     if usr == dlg.get_user():
      commonMessageDialogs.suspended_user()

src/controller/trendingTopics.py

@@ -8,7 +8,7 @@ class trendingTopicsController(object):
   self.countries = {}
   self.cities = {}
   self.dialog = trends.trendingTopicsDialog()
-  self.information = session.twitter.twitter.get_available_trends()
+  self.information = session.twitter.get_available_trends()
   self.split_information()
   widgetUtils.connect_event(self.dialog.country, widgetUtils.RADIOBUTTON, self.get_places)
   widgetUtils.connect_event(self.dialog.city, widgetUtils.RADIOBUTTON, self.get_places)

src/controller/user.py

@@ -41,9 +41,9 @@ class profileController(object):
    self.do_update()
 
  def get_data(self, screen_name):
-  self.data = self.session.twitter.twitter.show_user(screen_name=screen_name)
+  self.data = self.session.twitter.show_user(screen_name=screen_name)
   if screen_name != self.session.db["user_name"]:
-   self.friendship_status = self.session.twitter.twitter.show_friendship(source_screen_name=self.session.db["user_name"], target_screen_name=screen_name)
+   self.friendship_status = self.session.twitter.show_friendship(source_screen_name=self.session.db["user_name"], target_screen_name=screen_name)
 
  def fill_profile_fields(self):
   self.dialog.set_name(self.data["name"])
@@ -81,11 +81,11 @@ class profileController(object):
   url = self.dialog.get("url")
   if self.file != None:
    try:
-    self.session.twitter.twitter.update_profile_image(image=self.file)
+    self.session.twitter.update_profile_image(image=self.file)
    except TwythonError as e:
     output.speak(u"Error %s. %s" % (e.error_code, e.msg))
   try:
-   self.session.twitter.twitter.update_profile(name=name, description=description, location=location, url=url)
+   self.session.twitter.update_profile(name=name, description=description, location=location, url=url)
   except TwythonError as e:
    output.speak(u"Error %s. %s" % (e.error_code, e.msg))
 

src/controller/userActionsController.py

@@ -29,43 +29,43 @@ class userActionsController(object):
 
  def follow(self, user):
   try:
-   self.session.twitter.twitter.create_friendship(screen_name=user )
+   self.session.twitter.create_friendship(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)
 
  def unfollow(self, user):
   try:
-   id = self.session.twitter.twitter.destroy_friendship(screen_name=user )
+   id = self.session.twitter.destroy_friendship(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)
 
  def mute(self, user):
   try:
-   id = self.session.twitter.twitter.create_mute(screen_name=user )
+   id = self.session.twitter.create_mute(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)
 
  def unmute(self, user):
   try:
-   id = self.session.twitter.twitter.destroy_mute(screen_name=user )
+   id = self.session.twitter.destroy_mute(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)
 
  def report(self, user):
   try:
-   id = self.session.twitter.twitter.report_spam(screen_name=user )
+   id = self.session.twitter.report_spam(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)
 
  def block(self, user):
   try:
-   id = self.session.twitter.twitter.create_block(screen_name=user )
+   id = self.session.twitter.create_block(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)
 
  def unblock(self, user):
   try:
-   id = self.session.twitter.twitter.destroy_block(screen_name=user )
+   id = self.session.twitter.destroy_block(screen_name=user )
   except TwythonError as err:
    output.speak("Error %s: %s" % (err.error_code, err.msg), True)