Switch all urllib/urlparse usage to six.moves.urllib.

This provides Python 2+3 compatibility for our use of urllib.

Also add a test to avoid future regressions.
This commit is contained in:
Tim Abbott 2016-01-23 18:39:44 -08:00
parent 36131a385b
commit 4dc5761ce2
4 changed files with 12 additions and 13 deletions

View file

@ -37,7 +37,7 @@ import json
import logging
import os
import time
import urllib2
from six.moves import urllib
import sys
@ -74,8 +74,8 @@ def fetch_from_asana(path):
headers = {"Authorization": "Basic %s" % auth}
url = "https://app.asana.com/api/1.0" + path
request = urllib2.Request(url, None, headers)
result = urllib2.urlopen(request)
request = urllib.request.Request(url, None, headers)
result = urllib.request.urlopen(request)
return json.load(result)

View file

@ -32,7 +32,7 @@ import optparse
import os
import sys
import time
import urlparse
from six.moves import urllib
import feedparser
import zulip
@ -169,7 +169,7 @@ client = zulip.Client(email=opts.email, api_key=opts.api_key,
first_message = True
for feed_url in feed_urls:
feed_file = os.path.join(opts.data_dir, urlparse.urlparse(feed_url).netloc)
feed_file = os.path.join(opts.data_dir, urllib.parse.urlparse(feed_url).netloc)
try:
with open(feed_file, "r") as f: