Use BytesIO instead of StringIO

[bup.git] / cmd / web-cmd.py

diff --git a/cmd/web-cmd.py b/cmd/web-cmd.py
index 1c515e2d10d6ddfa0d488311adcd1f73315f11d8..640e4ae8de3126983b414602b7d3504e5020aad0 100755 (executable)
--- a/cmd/web-cmd.py
+++ b/cmd/web-cmd.py
@@ -1,4 +1,9 @@
-#!/usr/bin/env python
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
 import sys, stat, urllib, mimetypes, posixpath, time, webbrowser
 import urllib
 from bup import options, git, vfs
@@ -105,7 +110,7 @@ class BupRequestHandler(tornado.web.RequestHandler):
 
         try:
             show_hidden = int(self.request.arguments.get('hidden', [0])[-1])
-        except ValueError, e:
+        except ValueError as e:
             show_hidden = False
 
         self.render(
@@ -224,7 +229,7 @@ if __name__ == "__main__":
 
     try:
         sock = http_server._socket # tornado < 2.0
-    except AttributeError, e:
+    except AttributeError as e:
         sock = http_server._sockets.values()[0]
 
     print "Serving HTTP on %s:%d..." % sock.getsockname()