Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Webshrinker for python 3 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Webshrinker for python 3 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions webshrinker/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ def signed_url(self, method, parameters=None):

url = "%s?%s" % (url, query)
to_hash = "%s:%s" % (self.secret_key, url)
hash = hashlib.md5(to_hash).hexdigest()
url = "%s/%s&hash=%s" % (self.end_point, url, hash)
hash_ = hashlib.md5(to_hash.encode()).hexdigest()
url = "%s/%s&hash=%s" % (self.end_point, url, hash_)

return url

Expand All @@ -88,7 +88,7 @@ def request(self, method, parameters=None):
url = self.signed_url(method, parameters)

if self.debug:
print "Requesting: " + url
print("Requesting: " + url)

try:
response = session.get(url, headers=self.request_headers, verify=self.verify_ssl, timeout=self.request_timeout)
Expand Down Expand Up @@ -125,7 +125,7 @@ def request_json(self, method, parameter=None):
if response.status_code == 200 or response.status_code == 202:
if self.debug:
if response.headers["content-type"] != "application/json":
print "Warning: expected content type 'application/json', got '%s'" % response.headers["content-type"]
print("Warning: expected content type 'application/json', got '%s'" % response.headers["content-type"])

return response, data["data"][0]
elif response.status_code == 400:
Expand Down Expand Up @@ -183,7 +183,7 @@ def list(self):
return result

def lookup(self, uri):
url = base64.b64encode(uri)
url = base64.b64encode(uri.encode()).decode()
(response, result) = self.request_json(url)

result["categorizing"] = False
Expand All @@ -202,7 +202,7 @@ def image(self, url=None, size="xlarge", refresh=False, expires=False, fullpage=
if not url:
raise RequestException("The 'url' parameter is required")

url = base64.b64encode(url)
url = base64.b64encode(url.encode()).decode()

parameters = {
"size" : size
Expand All @@ -225,7 +225,7 @@ def info(self, url=None, size="xlarge", refresh=False, expires=False, fullpage=F
if not url:
raise RequestException("The 'url' parameter is required")

url = "%s/info" % base64.b64encode(url)
url = "%s/info" % base64.b64encode(url.encode()).decode()

parameters = {
"size" : size
Expand Down