fix compatible with python3

Author: xiaoqi.wang

.gitignore

@@ -3,3 +3,5 @@
 /dist
 *.egg-info
 *.swp
+.python-version
+.idea/

.travis.yml

@@ -2,6 +2,8 @@ language: python
 python:
   - "2.6"
   - "2.7"
-install: "pip install lxml BeautifulSoup4 requests"
+  - "3.5"
+  - "3.6"
+install: "pip install -r requirements.txt"
 script: 
   - python test/test.py

README.txt

@@ -14,21 +14,21 @@ The basic idea is to insert all css/javascript files into html directly, and use
 Save web page directly from url (**recommended** way):
 
 ```bash
-$ python2 webpage2html.py http://www.google.com > google.html
+$ python webpage2html.py https://www.google.com > google.html
 ```
 
 or save web page first using browsers such as Chrome, to something.html with something_files directory beside.
 
 ```bash
-$ python2 webpage2html.py /path/to/something.html > something_single.html
+$ python webpage2html.py /path/to/something.html > something_single.html
 ```
 
 But note that the second method may not always work as expected, because there may be urls like `//ssl.gstatic.com/gb/images/v1_c69d5271.png` (from google index page), but the file is missing in `Google_files` directory saved by browsers.
 
 Enable javascript, for example, save 2048 game page into a single html for offline playing
 
 ```bash
-$ python2 webpage2html.py -s http://gabrielecirulli.github.io/2048/ > 2048.html
+$ python webpage2html.py -s http://gabrielecirulli.github.io/2048/ > 2048.html
 ```
 
 ## Dependency

readme.md

@@ -1,7 +1,4 @@
-#!/usr/bin/env python2
-
 from distutils.core import setup
-from setuptools import find_packages
 
 setup(
     name='webpage2html',
@@ -14,19 +11,19 @@
     license='LICENSE.txt',
     keywords="webpage html convert",
     description='Save/convert web pages to a single editable html file',
-    long_description=open('README.txt').read(),
+    long_description=open('readme.md').read(),
 
-    py_modules = ['webpage2html'],
+    py_modules=['webpage2html'],
 
     # Refers to test/test.py
     test_suite='test.test',
 
-    entry_points = {
+    entry_points={
         'console_scripts': [
             'webpage2html=webpage2html:main'
         ]
     },
-    classifiers = [
+    classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Intended Audience :: Developers',
@@ -35,6 +32,8 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development',
         'Topic :: System',
         'Topic :: Terminals',

setup.py

@@ -1,53 +1,61 @@
-#!/usr/bin/env python2
+from __future__ import print_function
+
+import os
+import sys
+import unittest
 
-import os, sys, unittest
 import webpage2html
 
-class Test(unittest.TestCase):
 
+class Test(unittest.TestCase):
     def test_none(self):
-        print ''
+        print('')
         self.assertEqual(webpage2html.generate('non-existing-file.html', comment=False, verbose=False), '')
 
     def test_pre_formatting(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./test_pre_formatting.html', comment=False)
         assert '<pre><code>$ git clone https://github.com/chaitin/sqlchop</code></pre>' in gen
 
     def test_0ops(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./hacklu-ctf-2013-exp400-wannable-0ops.html', comment=False)
-        print gen
+        print(gen)
         assert '<style data-href="./hacklu-ctf-2013-exp400-wannable-0ops_files/screen.css" media="screen, projection" rel="stylesheet" type="text/css">html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt' in gen
 
     def test_no_script(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./test_no_script.html', comment=False, keep_script=False)
         assert '<script' not in gen, gen
 
     def test_full_url(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./another_dir/test_full_url.html', comment=False, full_url=True)
         assert 'href="another_dir/questions/110240"' in gen or 'href="./another_dir/questions/110240"' in gen, gen
         assert 'href="another_dir/static/img/favicon.ico"' in gen or 'href="./another_dir/static/img/favicon.ico"' in gen, gen
 
     def test_web_font(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./webfont.html', comment=False, full_url=True)
         # FIXME: do not cover all web fonts with hash postfix
-        assert 'application/x-font-ttf' in gen, gen
+        assert 'application/x-font-ttf' in gen and 'application/font-woff' in gen, gen
 
     def test_text_css(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./text_css.html', comment=False, full_url=True)
-        print gen
         assert '<style data-href="./text_css/style.css" rel="stylesheet" type="text/css">@import url(data:text/css;base64,Cmh' in gen
 
     def test_link_media(self):
-        print ''
+        print('')
         gen = webpage2html.generate('./test_css_screen.html', comment=False, full_url=True)
         assert 'media="screen"' in gen
 
+    def test_requests_page(self):
+        print('')
+        gen = webpage2html.generate('./test_requests_page.html', comment=False, full_url=True)
+        assert '<div id="searchbox" role="search" style="display: none">' in gen
+
+
 if __name__ == '__main__':
     if os.path.dirname(sys.argv[0]):
         os.chdir(os.path.dirname(sys.argv[0]))