Do not quote ~ for oauth; see https://dev.twitter.com/discussions/1260

[z_archive/twitter.git] / twitter / api.py

diff --git a/twitter/api.py b/twitter/api.py
index 838f40b8fbf872ac740781d4f109ca137e818f54..2a9f93556cd0bf60c87597752d5fb74547854b04 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -8,6 +8,8 @@ except ImportError:
 from twitter.twitter_globals import POST_ACTIONS
 from twitter.auth import NoAuth
 
 from twitter.twitter_globals import POST_ACTIONS
 from twitter.auth import NoAuth
 

+import re
+

 try:
     import json
 except ImportError:
 try:
     import json
 except ImportError:


@@ -36,10 +38,11 @@ class TwitterHTTPError(TwitterError):
         self.response_data = self.e.fp.read()
 
     def __str__(self):
         self.response_data = self.e.fp.read()
 
     def __str__(self):

+        fmt = ("." + self.format) if self.format else ""

         return (
         return (

-            "Twitter sent status %i for URL: %s.%s using parameters: "
+            "Twitter sent status %i for URL: %s%s using parameters: "

             "(%s)\ndetails: %s" %(
             "(%s)\ndetails: %s" %(

-                self.e.code, self.uri, self.format, self.uriparts,
+                self.e.code, self.uri, fmt, self.uriparts,

                 self.response_data))
 
 class TwitterResponse(object):
                 self.response_data))
 
 class TwitterResponse(object):


@@ -82,6 +85,9 @@ def wrap_response(response, headers):
         def __init__(self, response, headers):
             response_typ.__init__(self, response)
             TwitterResponse.__init__(self, headers)
         def __init__(self, response, headers):
             response_typ.__init__(self, response)
             TwitterResponse.__init__(self, headers)

+        def __new__(cls, response, headers):
+            return response_typ.__new__(cls, response)
+

 
     return WrappedTwitterResponse(response, headers)
 
 
     return WrappedTwitterResponse(response, headers)
 


@@ -124,11 +130,13 @@ class TwitterCall(object):
             uriparts.append(str(kwargs.pop(uripart, uripart)))
         uri = '/'.join(uriparts)
 
             uriparts.append(str(kwargs.pop(uripart, uripart)))
         uri = '/'.join(uriparts)
 

-        method = "GET"
-        for action in POST_ACTIONS:
-            if uri.endswith(action):
-                method = "POST"
-                break
+        method = kwargs.pop('_method', None)
+        if not method:
+            method = "GET"
+            for action in POST_ACTIONS:
+                if re.search("%s(/\d+)?$" % action, uri):
+                    method = "POST"
+                    break

 
         # If an id kwarg is present and there is no id to fill in in
         # the list of uriparts, assume the id goes at the end.
 
         # If an id kwarg is present and there is no id to fill in in
         # the list of uriparts, assume the id goes at the end.