diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2014-06-07 13:49:39 +0300 |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2014-06-07 13:49:39 +0300 |
commit | 120fa4ae95329007c529b310f4e950146d44159f (patch) | |
tree | 8a96a536578a7d8be224c99aade7431d24834bb2 /mediagoblin/processing/task.py | |
parent | dce76c3ee7153e8340cb3d64e8ee4df23a545bc4 (diff) | |
download | mediagoblin-120fa4ae95329007c529b310f4e950146d44159f.tar.lz mediagoblin-120fa4ae95329007c529b310f4e950146d44159f.tar.xz mediagoblin-120fa4ae95329007c529b310f4e950146d44159f.zip |
Change urllib and urllib import with six.moves.urllib.
Diffstat (limited to 'mediagoblin/processing/task.py')
-rw-r--r-- | mediagoblin/processing/task.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index 7f683485..1a21c6d2 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -15,8 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import logging -import urllib -import urllib2 + +from six.moves.urllib import request, parse import celery from celery.registry import tasks @@ -42,15 +42,15 @@ def handle_push_urls(feed_url): hubparameters = { 'hub.mode': 'publish', 'hub.url': feed_url} - hubdata = urllib.urlencode(hubparameters) + hubdata = parse.urlencode(hubparameters) hubheaders = { "Content-type": "application/x-www-form-urlencoded", "Connection": "close"} for huburl in mgg.app_config["push_urls"]: - hubrequest = urllib2.Request(huburl, hubdata, hubheaders) + hubrequest = request.Request(huburl, hubdata, hubheaders) try: - hubresponse = urllib2.urlopen(hubrequest) - except (urllib2.HTTPError, urllib2.URLError) as exc: + hubresponse = request.urlopen(hubrequest) + except (request.HTTPError, request.URLError) as exc: # We retry by default 3 times before failing _log.info("PuSH url %r gave error %r", huburl, exc) try: |