From e16bf2edeb9fb4a2b70bdbf965228aac40803f21 Mon Sep 17 00:00:00 2001 From: Ha Junsoo Date: Sat, 16 Jan 2016 19:56:00 +0900 Subject: [PATCH 1/4] make python3 compatible --- extraction/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 5561cba14b1aa3b1d51c94bc4eca1db28bae80f4 Mon Sep 17 00:00:00 2001 From: Ha Junsoo Date: Mon, 18 Jan 2016 06:21:00 +0900 Subject: [PATCH 2/4] update CHANGES --- CHANGES.txt | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/setup.py b/setup.py index 4accb8e..bf12ccc 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='extraction', - version='0.2', + version='0.2.1', author='Will Larson', author_email='lethain@gmail.com', packages=['extraction', 'extraction.tests', 'extraction.examples'], From 9be999ea18a6318f834210ecf87cbf5cd317c3d6 Mon Sep 17 00:00:00 2001 From: Ha Junsoo Date: Wed, 24 Feb 2016 11:09:01 +0900 Subject: [PATCH 3/4] read README.rst as utf8 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bf12ccc..99c6bf3 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ 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', 'utf-8').read(), install_requires=[ "beautifulsoup4 >= 4.1.3", "html5lib", From 8595eb187c575cb7bcf13efa2bc0b8c4f86e908b Mon Sep 17 00:00:00 2001 From: Ha Junsoo Date: Wed, 24 Feb 2016 11:11:09 +0900 Subject: [PATCH 4/4] 'typo' --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 99c6bf3..f6afb8a 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ url='http://pypi.python.org/pypi/extraction/', license='LICENSE.txt', description='Extract basic info from HTML webpages.', - long_description=open('README.rst', 'r', 'utf-8').read(), + long_description=open('README.rst', 'r', encoding='utf-8').read(), install_requires=[ "beautifulsoup4 >= 4.1.3", "html5lib",