]> jfr.im git - z_archive/twitter.git/commitdiff
Merge commit 'origin/master' into twitter_agent
authorHatem Nassrat <redacted>
Sat, 14 Feb 2009 06:41:43 +0000 (02:41 -0400)
committerHatem Nassrat <redacted>
Sat, 14 Feb 2009 06:41:43 +0000 (02:41 -0400)
* commit 'origin/master':
  Documentation for searching was incorrect, fixed
  Bugfix-- twitterbot help message was not showing when no ini file present
  New functionality... time for v0.5
  Add Wes D. to AUTHORS file.
  Add reply action (patch by Wes Devauld)
  Add Hatem to AUTHORS file, prep for 0.4.5 release soonish
  Allowing the choice of twitter domain.

Conflicts:
twitter/api.py

1  2 
twitter/api.py

diff --cc twitter/api.py
index 872a9747d3ad314bb18fde82de00f2e70fdf8a61,2fa4e19c3d65a1adf28d0894f5f36f16481f533c..4ce4781e1c720015021e9437148943e441fbcb4f
@@@ -23,20 -23,19 +23,23 @@@ class TwitterError(Exception)
      pass
  
  class TwitterCall(object):
-     def __init__(self, username, password, format, uri="", agent="twitter.py"):
 -    def __init__(self, username, password, format, domain, uri=""):
++    def __init__(
++        self, username, password, format, domain, uri="", agent="twitter.py"
++    ):
          self.username = username
          self.password = password
          self.format = format
 -        self.uri = uri
+         self.domain = domain
 +        self.uri = uri
 +        self.agent = agent
      def __getattr__(self, k):
          try:
              return object.__getattr__(self, k)
          except AttributeError:
              return TwitterCall(
-                 self.username, self.password, self.format, 
+                 self.username, self.password, self.format, self.domain,
 -                self.uri + "/" + k)
 +                self.uri + "/" + k, self.agent
 +            )
      def __call__(self, **kwargs):
          method = "GET"
          if (self.uri.endswith('new')