From 327b8504c473942e50e5c545cec8e0552ee2e4d2 Mon Sep 17 00:00:00 2001 From: pictuga Date: Wed, 25 Feb 2015 18:22:38 +0800 Subject: [PATCH] 2to3: feeds.py port urllib2 --- morss/feeds.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/morss/feeds.py b/morss/feeds.py index 74ae74c..449bfcd 100644 --- a/morss/feeds.py +++ b/morss/feeds.py @@ -1,12 +1,10 @@ #!/usr/bin/env python from datetime import datetime -from StringIO import StringIO import re import json import csv -import urllib2 from lxml import etree from dateutil import tz @@ -23,8 +21,13 @@ json.encoder.c_make_encoder = None try: from collections import OrderedDict + from StringIO import StringIO + from urllib2 import urlopen except ImportError: from ordereddict import OrderedDict + from io import StringIO + from urllib.request import urlopen + Element = etree.Element @@ -39,7 +42,7 @@ NSMAP = {'atom': 'http://www.w3.org/2005/Atom', def load(url): - d = urllib2.urlopen(url).read() + d = urlopen(url).read() return parse(d)