Merge lp:~blueyed/ubuntu-dev-tools/use-proxy-for-download into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

[Daniel Hahler]

[Daniel Holbach (dholbach)]

Good work!

review: Approve

[Stefano Rivera (stefanor)]

This broke the unit tests. Would you mind having a look at fixing them?

[Daniel Hahler (blueyed)]

I'm not sure about what test exactly broke.. when running "python setup.py test" there appear to be a lot of failures:
http://paste.ubuntu.com/892919/

Apart from that I would like to fix the tests, but need some help obviously.
Thanks! (and sorry for breaking any test in the first place)

[Stefano Rivera (stefanor)]

Don't worry, I dealt with it.

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-29 21:23:05 +0000
+++ debian/changelog	2012-03-16 15:29:18 +0000
@@ -1,11 +1,16 @@
 ubuntu-dev-tools (0.140) UNRELEASED; urgency=low
 
+  [ Stefano Rivera ]
   * Bump Standards-Version to 3.9.3, no changes needed.
   * Update machine-readable copyright Format to 1.0.
   * pbuilder-dist: Use the same chroot, whether the system-architecture was
     the supplied architecture or was chosen by default (LP: #943435)
 
- -- Stefano Rivera <[e-mail]>  Sat, 25 Feb 2012 16:09:53 +0200
+  [ Daniel Hahler ]
+  * ubuntutools/archive.py: use ProxyHandler in _download_file.
+    This makes use of the system proxy (e.g. http_proxy).
+
+ -- Daniel Hahler <[e-mail]>  Fri, 16 Mar 2012 16:21:00 +0100
 
 ubuntu-dev-tools (0.139) unstable; urgency=low
 
 
=== modified file 'ubuntutools/archive.py'
--- ubuntutools/archive.py	2011-11-22 13:57:02 +0000
+++ ubuntutools/archive.py	2012-03-16 15:29:18 +0000
@@ -317,8 +317,10 @@
         if parsed.scheme == 'file':
             in_ = open(parsed.path, 'r')
         else:
+            proxy = urllib2.ProxyHandler() # uses default proxy from environment
+            opener = urllib2.build_opener(proxy)
             try:
-                in_ = urllib2.urlopen(url)
+                in_ = opener.open(url)
             except urllib2.URLError:
                 return False