Merge lp:~igorsantos07/rescuetime-linux-uploader/rescuetime-linux-uploader into lp:rescuetime-linux-uploader

[Igor Santos]

I was having problems on using the uploader under a proxy.
The current code sets proxy information only for HTTP, and the API uses HTTPS.
Anyway, there's no need of setting a dictionary of proxy URLs for ProxyHandler, since it uses the default environment vars the script was fetching. So I removed this part of the code and let ProxyHandler find all the proxy URLs the system has.

[Dirk T (miriup)]

This is just a quick note that I will review the changes ASAP and get back to you. Please stay patient. ;)

[Igor Santos (igorsantos07)]

Thanks!
This is a bug that affects everyone under a proxy, but it doesn't appear
to have many users in the situation - as I didn't find anything under bugs
about this.

Anyway the fix was easy and I hope I have followed all the steps right to
get this fix onto the main codebase (:
[almost first time hacking with python and first time messing up with
bazaar haha]

[Dirk T (miriup)]

Confirmed that proxy configuration is taken from the environment:
http://docs.python.org/library/urllib2#urllib2.ProxyHandler

[Dirk T (miriup)]

Ok, works without problems without proxy. I'd assume Igor has tested it with proxy. Can't see anything that can go wrong, so fix will be committed.

review: Approve (code inspection)

=== modified file 'RescueTimeUploader/uploader.py'
--- RescueTimeUploader/uploader.py	2010-03-12 17:47:30 +0000
+++ RescueTimeUploader/uploader.py	2012-04-18 16:08:18 +0000
@@ -29,9 +29,8 @@
 
 RESCUETIME_API_URL = "https://api.rescuetime.com/api/"
 
-if os.getenv('http_proxy') != None:
-	proxy_url = os.getenv('http_proxy') 
-	proxy_support = urllib2.ProxyHandler({'http': proxy_url})
+if os.getenv('http_proxy') != None or os.getenv('https_proxy') != None:
+	proxy_support = urllib2.ProxyHandler()
 	opener = urllib2.build_opener(proxy_support, urllib2.HTTPHandler)
 	urllib2.install_opener(opener)