commit 6a767deed67542f946b34f466e05dc3221e6fcc3
author Jenkins <jenkins@review.openstack.org> Mon Mar 17 17:15:38 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 17 17:15:38 2014 +0000
tree a9b1a87ca439f92a535f65260df9db554df88018
parent 2a414528e2dcd24129ae53e3592243245af6ec16
parent 5eb59d3e10f04a8e02b3dd15c8b68f2bdf0734ba

Merge "Keep py3.X compatibility for urllib"

jeepyb/cmd/openstackwatch.py

diff --git a/jeepyb/cmd/openstackwatch.py b/jeepyb/cmd/openstackwatch.py
index 1798d48..c984818 100644
--- a/jeepyb/cmd/openstackwatch.py
+++ b/jeepyb/cmd/openstackwatch.py
@@ -30,9 +30,9 @@
 import os
 import sys
 import time
-import urllib
 
 import PyRSS2Gen
+import six.moves.urllib.parse as urlparse
 
 PROJECTS = ['openstack/nova', 'openstack/keystone', 'opensack/swift']
 JSON_URL = 'https://review.openstack.org/query'
@@ -94,7 +94,7 @@
     url = CONFIG['json_url']
     if project:
         url += "+project:" + project
-    fp = urllib.urlretrieve(url)
+    fp = urlparse.urlretrieve(url)
     ret = open(fp[0]).read()
     return ret
 

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index e6f46b6..b155078 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,4 @@
 pkginfo
 PyRSS2Gen
 python-swiftclient
+six>=1.4.1