Merge lp:~myint/restview/trunk into lp:~mgedmin/restview/trunk

[Steven Myint]

Support Python 3 while maintaining Python 2 support.

[lp:~myint/restview/trunk]

87. By <email address hidden> on 2012-12-22

Add Python 3 classifier

[Marius Gedminas (mgedmin)]

Thank you, this looks very useful!

review: Approve

=== modified file 'restview'
--- restview	2008-07-26 10:08:59 +0000
+++ restview	2012-12-22 14:33:22 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import sys, os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'src'))
 

=== modified file 'setup.py'
--- setup.py	2010-09-14 09:39:05 +0000
+++ setup.py	2012-12-22 14:33:22 +0000
@@ -9,7 +9,7 @@
     for line in read(filename).splitlines():
         if line.startswith('__version__'):
             d = {}
-            exec line in d
+            exec(line, d)
             return d['__version__']
     raise AssertionError("couldn't find __version__ in %s" % filename)
 
@@ -32,6 +32,8 @@
         'Intended Audience :: End Users/Desktop',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Operating System :: OS Independent',
         'Topic :: Documentation',
         'Topic :: Internet :: WWW/HTTP :: HTTP Servers',

=== modified file 'src/restview/restviewhttp.py'
--- src/restview/restviewhttp.py	2012-10-24 12:50:41 +0000
+++ src/restview/restviewhttp.py	2012-12-22 14:33:22 +0000
@@ -16,6 +16,7 @@
 Needs docutils and a web browser.  Will syntax highlight if you have pygments
 installed.
 """
+from __future__ import print_function
 
 import os
 import re
@@ -24,10 +25,23 @@
 import optparse
 import threading
 import webbrowser
-import BaseHTTPServer
-import SocketServer
+
+try:
+    import BaseHTTPServer
+except ImportError:
+    import http.server as BaseHTTPServer
+
+try:
+    import SocketServer
+except ImportError:
+    import socketserver as SocketServer
+
 import cgi
-import urllib
+
+try:
+    from urllib import unquote
+except ImportError:
+    from urllib.parse import unquote
 
 import docutils.core
 import docutils.writers.html4css1
@@ -41,6 +55,12 @@
     pygments = None
 
 
+try:
+    unicode
+except NameError:
+    unicode = str
+
+
 __version__ = "1.3.0dev"
 
 
@@ -58,7 +78,7 @@
         content = self.do_GET_or_HEAD()
 
     def do_GET_or_HEAD(self):
-        self.path = urllib.unquote(self.path)
+        self.path = unquote(self.path)
         root = self.server.renderer.root
         command = self.server.renderer.command
         if self.path == '/':
@@ -119,7 +139,7 @@
                 return self.handle_rest_data(f.read())
             finally:
                 f.close()
-        except IOError, e:
+        except IOError as e:
             self.log_error("%s", e)
             self.send_error(404, "File not found")
 
@@ -130,7 +150,7 @@
                 return self.handle_rest_data(f.read())
             finally:
                 f.close()
-        except OSError, e:
+        except OSError as e:
             self.log_error("%s" % e)
             self.send_error(404, "Command execution failed")
 
@@ -324,7 +344,7 @@
         try:
             docutils.core.publish_string(rest_input, writer=writer,
                                          settings_overrides=settings_overrides)
-        except Exception, e:
+        except Exception as e:
             return self.render_exception(e.__class__.__name__, str(e),
                                          rest_input)
         return writer.output
@@ -415,11 +435,11 @@
         ('', 1234)
 
         >>> try: parse_address('notanumber')
-        ... except ValueError, e: print e
+        ... except ValueError as e: print(e)
         Invalid address: notanumber
 
         >>> try: parse_address('la:la:la')
-        ... except ValueError, e: print e
+        ... except ValueError as e: print(e)
         Invalid address: la:la:la
 
     """
@@ -501,12 +521,12 @@
     if opts.listen:
         try:
             server.local_address = parse_address(opts.listen)
-        except ValueError, e:
+        except ValueError as e:
             sys.exit(str(e))
     host = get_host_name(server.local_address[0])
     port = server.listen()
     url = 'http://%s:%d/' % (host, port)
-    print "Listening on %s" % url
+    print("Listening on %s" % url)
     if opts.browser:
         # launch the web browser in the background as it may block
         t = threading.Thread(target=webbrowser.open, args=(url,))

=== modified file 'test.py'
--- test.py	2010-08-06 02:13:18 +0000
+++ test.py	2012-12-22 14:33:22 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import unittest
 import doctest