X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/d20da7f3e83b0c68402d46ef96c463c307cd9e2f..6c527e720d83ba84321304ca0a1e6ef5adae079e:/twitter/api.py

diff --git a/twitter/api.py b/twitter/api.py
index 337369b..06e9ca8 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -55,8 +55,11 @@ class TwitterCall(object):
         secure_str = ''
         if self.secure:
             secure_str = 's'
-        uriBase = "http%s://%s/%s.%s" %(
-                    secure_str, self.domain, uri, self.format)
+        dot = ""
+        if self.format != '':
+            dot = "."
+        uriBase = "http%s://%s/%s%s%s" %(
+                    secure_str, self.domain, uri, dot, self.format)
 
         if (not self.encoded_args):
             if kwargs.has_key('id'):
@@ -174,7 +177,7 @@ class Twitter(TwitterCall):
         if not auth:
             auth = NoAuth()
 
-        if (format not in ("json", "xml")):
+        if (format not in ("json", "xml", "")):
             raise TwitterError("Unknown data format '%s'" %(format))
         TwitterCall.__init__(
             self, auth, format, domain, "", agent,