Misc. updates following 2to3 checks.

--HG--
branch : single-codebase

1 files changed, 13 insertions, 4 deletions

diff --git a/release.py b/release.py
index 632bf4cb..2e35feb1 100644
--- a/release.py
+++ b/release.py
@@ -18,6 +18,15 @@ import itertools
 import re
 
 try:
+    from urllib2 import urlopen, Request, HTTPError
+    from itertools import izip_longest
+except ImportError:
+    from urllib.request import urlopen, Request
+    from urllib.error import HTTPError
+    raw_input = input
+    from itertools import zip_longest as izip_longest
+
+try:
 	import keyring
 except Exception:
 	pass
@@ -99,11 +108,11 @@ def add_milestone_and_version(version):
 	for type in 'milestones', 'versions':
 		url = (base + '/1.0/repositories/{repo}/issues/{type}'
 			.format(repo = get_repo_name(), type=type))
-		req = urllib2.Request(url = url, headers = headers,
+		req = Request(url = url, headers = headers,
 			data='name='+version)
 		try:
-			urllib2.urlopen(req)
-		except urllib2.HTTPError as e:
+			urlopen(req)
+		except HTTPError as e:
 			print(e.fp.read())
 
 def bump_versions(target_ver):
@@ -225,7 +234,7 @@ def _linkified_text(rst_content):
 	anchors = []
 	linkified_parts = [_linkified_part(part, anchors)
 		for part in plain_text_parts]
-	pairs = itertools.izip_longest(
+	pairs = izip_longest(
 		linkified_parts,
 		HREF_pattern.findall(rst_content),
 		fillvalue='',