1. Lincoln Loop
  2. Untitled project
  3. python-cloudfiles


Florian Hines  committed 0c08722 Merge

Merge pull request #82 from sasimpson/timeout_fix

Timeout fix

  • Participants
  • Parent commits 2c6f454, 480c67d
  • Branches master

Comments (0)

Files changed (3)

File cloudfiles/authentication.py

View file
  • Ignore whitespace
     The base authentication class from which all others inherit.
-    def __init__(self, username, api_key, authurl=us_authurl, timeout=5,
+    def __init__(self, username, api_key, authurl=us_authurl, timeout=15,
         self.authurl = authurl
         self.headers = dict()

File cloudfiles/connection.py

View file
  • Ignore whitespace
     @undocumented: _check_container_name
-    def __init__(self, username=None, api_key=None, timeout=5, **kwargs):
+    def __init__(self, username=None, api_key=None, timeout=15, **kwargs):
         Accepts keyword arguments for Mosso username and api key.
         Optionally, you can omit these keywords and supply an

File cloudfiles/storage_object.py

View file
  • Ignore whitespace
             buff = fobj.read(4096)
         return checksum.hexdigest()
+    @property
     def public_uri(self):
         Retrieve the URI for this object, if its container is public.
         @rtype: str
         return "%s/%s" % (self.container.public_uri().rstrip('/'),
-                unicode_quote(self.name))
+            unicode_quote(self.name))
     def public_ssl_uri(self):