Sébastien Fievet avatar Sébastien Fievet committed f2fca02

Fixed #54 Fix for sha depreciation warning in S3.py
Cleaned up import.

Comments (0)

Files changed (1)

 import base64
 import hmac
 import httplib
-import re
-import sha
-import sys
+try:
+    from hashlib import sha1 as sha
+except ImportError:
+    import sha
 import time
 import urllib
 import urlparse
                     = urlparse.urlparse(location)
             if scheme == "http":    is_secure = True
             elif scheme == "https": is_secure = False
-            else: raise invalidURL("Not http/https: " + location)
+            else: raise IOError("Not http/https: " + location)
             if query: path += "?" + query
             # retry with redirect
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.