Testing of merging the one ring and dialcentrals gvoice api's

diff --git a/hand_tests/gv.py b/hand_tests/gv.py
index a254d7e..c481dcb 100755 (executable)
--- a/hand_tests/gv.py
+++ b/hand_tests/gv.py
@@ -43,12 +43,12 @@ def main():
                for data in b.get_recent():
                        pprint.pprint(data)
 
-       if False:
+       if True:
                print "Contacts: ",
                for contact in b.get_contacts():
                        pprint.pprint(contact)
 
-       if True:
+       if False:
                print "Messages: ",
                for message in b.get_conversations():
                        pprint.pprint(message.to_dict())

diff --git a/src/gvoice/backend.py b/src/gvoice/backend.py
index a02ed76..bf9aed1 100755 (executable)
--- a/src/gvoice/backend.py
+++ b/src/gvoice/backend.py
@@ -489,9 +489,8 @@ class GVoiceBackend(object):
                smsJson = self._grab_json(smsPage)
                parsedSms = self._parse_sms(smsHtml)
                smss = self._merge_conversation_sources(parsedSms, smsJson)
-               decoratedSms = self._decorate_sms(smss)
 
-               allConversations = itertools.chain(voicemails, decoratedSms)
+               allConversations = itertools.chain(voicemails, smss)
                return allConversations
 
        def mark_message(self, messageId, asRead):
@@ -683,9 +682,6 @@ class GVoiceBackend(object):
 
                        yield conv
 
-       def _decorate_sms(self, parsedTexts):
-               return parsedTexts
-
        @staticmethod
        def _merge_conversation_sources(parsedMessages, json):
                for message in parsedMessages: