[postr] Replace http with https for the flickr urls
- From: Germán Poó Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [postr] Replace http with https for the flickr urls
- Date: Sat, 5 Jul 2014 23:37:45 +0000 (UTC)
commit becbb09b22e9a7a78275bde5c8376402052093e3
Author: Alexander Alemayhu <alexander bitraf no>
Date: Mon Jun 30 11:53:51 2014 -0700
Replace http with https for the flickr urls
src/SetCombo.py | 2 +-
src/flickrest.py | 12 ++++++------
src/postr.py | 6 +++---
src/util.py | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/SetCombo.py b/src/SetCombo.py
index 4cdc21c..82f9415 100644
--- a/src/SetCombo.py
+++ b/src/SetCombo.py
@@ -90,7 +90,7 @@ class SetCombo(Gtk.ComboBox):
0, photoset.get("id"),
1, photoset.find("title").text)
- url = "http://static.flickr.com/%s/%s_%s%s.jpg" % (photoset.get("server"),
photoset.get("primary"), photoset.get("secret"), "_s")
+ url = "https://static.flickr.com/%s/%s_%s%s.jpg" % (photoset.get("server"),
photoset.get("primary"), photoset.get("secret"), "_s")
deferred = getPage(url)
deferred.addCallback(self.__got_set_thumb, it)
deferred.addErrback(self.twisted_error)
diff --git a/src/flickrest.py b/src/flickrest.py
index 934c091..c1d83af 100644
--- a/src/flickrest.py
+++ b/src/flickrest.py
@@ -48,8 +48,8 @@ class FlickrError(Exception):
SIZE_LARGE) = range (0, 5)
class Flickr:
- endpoint = "http://api.flickr.com/services/rest/?"
-
+ endpoint = "https://api.flickr.com/services/rest/?"
+
def __init__(self, api_key, secret, perms="read"):
self.__methods = {}
self.api_key = api_key
@@ -74,7 +74,7 @@ class Flickr:
def set_proxy(self, proxy):
# Handle proxies which are not URLs
if proxy and "://" not in proxy:
- proxy = "http://" + proxy
+ proxy = "https://" + proxy
self.proxy = proxy
def __repr__(self):
@@ -212,7 +212,7 @@ class Flickr:
}
self.logger.info("Calling upload")
- deferred = client.upload("http://api.flickr.com/services/upload/",
+ deferred = client.upload("https://api.flickr.com/services/upload/",
proxy=self.proxy, method="POST",
headers=headers, postdata=form,
progress_tracker=progress_tracker)
@@ -257,7 +257,7 @@ class Flickr:
keys = { 'perms': self.perms,
'frob': frob }
self.__sign(keys)
- url =
"http://flickr.com/services/auth/?api_key=%(api_key)s&perms=%(perms)s&frob=%(frob)s&api_sig=%(api_sig)s" %
keys
+ url =
"https://flickr.com/services/auth/?api_key=%(api_key)s&perms=%(perms)s&frob=%(frob)s&api_sig=%(api_sig)s" %
keys
return {'url': url, 'frob': frob}
deferred = self.auth_getFrob()
@@ -320,4 +320,4 @@ class Flickr:
elif size == SIZE_LARGE:
suffix = "_b"
- return "http://static.flickr.com/%s/%s_%s%s.jpg" % (photo.get("server"), photo.get("id"),
photo.get("secret"), suffix)
+ return "https://static.flickr.com/%s/%s_%s%s.jpg" % (photo.get("server"), photo.get("id"),
photo.get("secret"), suffix)
diff --git a/src/postr.py b/src/postr.py
index 5418edd..b064b5f 100644
--- a/src/postr.py
+++ b/src/postr.py
@@ -247,11 +247,11 @@ class Postr(UniqueApp):
user = client.get_string("/system/http_proxy/authentication_user")
password = client.get_string("/system/http_proxy/authentication_password")
if user and user != "":
- url = "http://%s:%s %s:%d" % (user, password, host, port)
+ url = "https://%s:%s %s:%d" % (user, password, host, port)
else:
- url = "http://%s:%d" % (host, port)
+ url = "https://%s:%d" % (host, port)
else:
- url = "http://%s:%d" % (host, port)
+ url = "https://%s:%d" % (host, port)
self.flickr.set_proxy(url)
else:
diff --git a/src/util.py b/src/util.py
index eed535a..1449c98 100644
--- a/src/util.py
+++ b/src/util.py
@@ -101,9 +101,9 @@ def get_buddyicon(flickr, data, size=48):
return load_thumb(page, size)
if int(data.get("iconfarm")) > 0:
- url = "http://farm%s.static.flickr.com/%s/buddyicons/%s.jpg" % (data.get("iconfarm"),
data.get("iconserver"), data.get("nsid"))
+ url = "https://farm%s.static.flickr.com/%s/buddyicons/%s.jpg" % (data.get("iconfarm"),
data.get("iconserver"), data.get("nsid"))
else:
- url = "http://www.flickr.com/images/buddyicon.jpg"
+ url = "https://www.flickr.com/images/buddyicon.jpg"
if __buddy_cache.has_key(url):
return defer.execute(load_thumb, __buddy_cache[url], size)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]