Rev 5315: Make 'bzr' parsable by Python 3. in http://bazaar.launchpad.net/~lifeless/bzr/py3

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/py3

------------------------------------------------------------
revno: 5315
revision-id: robertc at robertcollins.net-20100622190553-ry6w5n3ji2pex0no
parent: pqm at pqm.ubuntu.com-20100622065243-mhmcsqhkkoi2uzcz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: py3
timestamp: Wed 2010-06-23 07:05:53 +1200
message:
  Make 'bzr' parsable by Python 3.
=== modified file 'bzr'
--- a/bzr	2010-06-21 03:55:08 +0000
+++ b/bzr	2010-06-22 19:05:53 +0000
@@ -89,7 +89,8 @@
 
 try:
     locale.setlocale(locale.LC_ALL, '')
-except locale.Error, e:
+except locale.Error:
+    e = sys.exc_info()[1]
     sys.stderr.write('bzr: warning: %s\n'
                      '  bzr could not set the application locale.\n'
                      '  Although this should be no problem for bzr itself,\n'
@@ -102,7 +103,7 @@
 sys._bzr_lazy_regex = True
 try:
     import bzrlib
-except ImportError, e:
+except ImportError:
     sys.stderr.write("bzr: ERROR: "
         "Couldn't import bzrlib and dependencies.\n"
         "Please check the directory containing bzrlib is on your PYTHONPATH.\n"