In playing with direct dial I found I setup the user-agent incorrectly

diff --git a/hand_tests/test_directdial.py b/hand_tests/test_directdial.py
index 6dac273..ed94e33 100755 (executable)
--- a/hand_tests/test_directdial.py
+++ b/hand_tests/test_directdial.py
@@ -8,22 +8,34 @@ _moduleLogger = logging.getLogger(__name__)
 sys.path.insert(0,"../src")
 
 import backends.gvoice
+import backends.browser_emu
 
 
 def main(username, password, number):
+       backends.browser_emu.USER_AGENT = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16"
        gvoice = backends.gvoice.GVoiceBackend()
        gvoice.login(username, password)
-
-       gvoice._browser.USER_AGENT = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16"
-       page = gvoice._get_page_with_token(
-               "https://www.google.com/voice/m/x",
-               {
-                       "m": "call",
-                       "n": "18004664411",
-                       "f": "",
-                       "v": "6",
-               },
-       )
+       for cookie in gvoice._browser._cookies:
+               print "\t", cookie
+
+       if False:
+               page = gvoice._get_page_with_token(
+                       "https://www.google.com/voice/m/x",
+                       {
+                               "m": "call",
+                               "n": "18004664411",
+                               "f": "",
+                               "v": "6",
+                       },
+               )
+       elif True:
+               page = gvoice._get_page_with_token(
+                       "https://www.google.com/voice/m/x?m=call&n=%s&f=&v=6" % "18004664411",
+                       {
+                       },
+               )
+       elif False:
+               page = gvoice._get_page("http://www.useragentstring.com/")
        print page
 
 

diff --git a/src/backends/browser_emu.py b/src/backends/browser_emu.py
index 6092398..5e9b678 100644 (file)
--- a/src/backends/browser_emu.py
+++ b/src/backends/browser_emu.py
@@ -143,6 +143,7 @@ class MozillaEmulator(object):
                        'Accept': 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png',
                        'Accept-Language': 'en,en-us;q=0.5',
                        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+                       'User-Agent': self.USER_AGENT,
                }
                for key, value in extraheaders.iteritems():
                        txheaders[key] = value
@@ -164,9 +165,6 @@ class MozillaEmulator(object):
                        urllib2.HTTPCookieProcessor(self._cookies),
                        redirector
                )
-               u.addheaders = [(
-                       'User-Agent', self.USER_AGENT
-               )]
                if not postdata is None:
                        req.add_data(postdata)
                return (req, u)