Merge lp:~spam-mason/flickrfs/fix-https into lp:ubuntu/vivid/flickrfs

[ClashTheBunny]

Flickr now requires https. This fix works for me when I perform the same change on utopic's package.

https://twitter.com/FlickrAPI/status/482530019906830338

[Timo Jyrinki (timo-jyrinki)]

Tested to be working, thanks a lot for the contribution! Sponsoring.

review: Approve

=== modified file 'flickrfs/flickrapi.py'
--- flickrfs/flickrapi.py	2007-03-29 18:11:48 +0000
+++ flickrfs/flickrapi.py	2014-11-18 09:24:22 +0000
@@ -245,7 +245,7 @@
 		if not self.__handlerCache.has_key(method):
 			def handler(_self = self, _method = method, **arg):
 				_method = "flickr." + _method.replace("_", ".")
-				url = "http://" + FlickrAPI.flickrHost + \
+				url = "https://" + FlickrAPI.flickrHost + \
 					FlickrAPI.flickrRESTForm
 				arg["method"] = _method
 				# Modified here: use default api_key and auth_token if not supplied
@@ -298,7 +298,7 @@
 
 		data = {"api_key": self.apiKey, "frob": frob, "perms": perms}
 		data["api_sig"] = self.__sign(data)
-		return "http://%s%s?%s" % (FlickrAPI.flickrHost, \
+		return "https://%s%s?%s" % (FlickrAPI.flickrHost, \
 			FlickrAPI.flickrAuthForm, urllib.urlencode(data))
 
 	#-------------------------------------------------------------------
@@ -337,7 +337,7 @@
 		if not 'api_key' in arg: arg["api_key"] = self.apiKey
 		if not 'auth_token' in arg: arg['auth_token'] = self.token
 		arg["api_sig"] = self.__sign(arg)
-		url = "http://" + FlickrAPI.flickrHost + FlickrAPI.flickrUploadForm
+		url = "https://" + FlickrAPI.flickrHost + FlickrAPI.flickrUploadForm
 
 		# construct POST data
 #		boundary = "===beej=jorgensen==========7d45e178b0434"