diff --git a/CHANGES.txt b/CHANGES.txt index a86dccf..8353d68 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,4 @@ +v0.2.1, 18/01/2016 -- Make Python3 compatible v0.2.0, 06/06/2014 -- Add Twitter cards extractor, DictExtractor, other fixes from @ducu. v0.1.3, 11/23/2012 -- Add html5lib to dependencies to ensure parsing is possible. v0.1.2, 11/23/2012 -- Update setup.py dependencies for saner installation, again. diff --git a/extraction/__init__.py b/extraction/__init__.py index edb50ef..ed88b55 100644 --- a/extraction/__init__.py +++ b/extraction/__init__.py @@ -8,7 +8,10 @@ >>> resp = extr.extract(html) >>> print resp """ -import urlparse +try: + import urlparse +except ImportError: + from urllib import parse as urlparse import importlib diff --git a/setup.py b/setup.py index 4accb8e..f6afb8a 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,14 @@ setup( name='extraction', - version='0.2', + version='0.2.1', author='Will Larson', author_email='lethain@gmail.com', packages=['extraction', 'extraction.tests', 'extraction.examples'], url='http://pypi.python.org/pypi/extraction/', license='LICENSE.txt', description='Extract basic info from HTML webpages.', - long_description=open('README.rst').read(), + long_description=open('README.rst', 'r', encoding='utf-8').read(), install_requires=[ "beautifulsoup4 >= 4.1.3", "html5lib",