Changeset 18476

Timestamp:

Apr 9, 2022, 10:54:14 PM (3 years ago)

Author:

Jun Omae

Message:

TracDragDropPlugin: make compatible with Python 3 (closes #14129)

File:

• tracdragdropplugin/0.12/tracdragdrop/web_ui.py (modified) (10 diffs)

tracdragdropplugin/0.12/tracdragdrop/web_ui.py

@@ -7 +7 @@
 import re
 import socket
+import sys
 from pkg_resources import parse_version, resource_filename
 from tempfile import TemporaryFile
@@ -23 +24 @@
 from trac.util.translation import domain_functions, dgettext
 
+if sys.version_info[0] == 2:
+    text_type = unicode
+    binary_type = str
+else:
+    text_type = str
+    binary_type = bytes
+
 _parsed_version = parse_version(__version__)
 
@@ -54 +62 @@
 def gettext_messages(msgid, **args):
     return dgettext('messages', msgid, **args)
+
+
+def _get_except():
+    return sys.exc_info()[1]
 
 
@@ -205 +217 @@
                 req.args['realm'] = match.group(2)
                 req.args['path'] = match.group(3)
-            except (IOError, socket.error), e:
-                if _is_disconnected(req, e):
+            except (IOError, socket.error):
+                if _is_disconnected(req, _get_except()):
                     raise RequestDone
                 raise
@@ -247 +259 @@
         except RequestDone:
             raise
-        except TracError, e:
-            return self._send_message_on_except(req, e, 500)
-        except PermissionError, e:
-            return self._send_message_on_except(req, e, 403)
-        except Exception, e:
-            self.log.error('Internal error in tracdragdrop',
-                           exc_info=True)
-            return self._send_message_on_except(req, e, 500)
+        except TracError:
+            return self._send_message_on_except(req, _get_except(), 500)
+        except PermissionError:
+            return self._send_message_on_except(req, _get_except(), 403)
+        except:
+            self.log.error('Internal error in tracdragdrop', exc_info=True)
+            return self._send_message_on_except(req, _get_except(), 500)
 
     def _delegate_new_request(self, req):
@@ -266 +277 @@
             try:
                 mod.process_request(req)
-            except OSError, e:
+            except OSError:
+                e = _get_except()
                 if e.args[0] == errno.ENAMETOOLONG:
                     raise TracError(_("Can't attach due to too long file "
@@ -291 +303 @@
             AttachmentModule(self.env).process_request(req)
         except RedirectListened:
-            req.send('Ok', status=200)
+            req.send(binary_type(), status=200)
 
     def _render_attachments(self, req):
@@ -322 +334 @@
 
     def _send_message_on_except(self, req, message, status):
-        if not isinstance(message, unicode):
+        if not isinstance(message, text_type):
             message = to_unicode(message)
         req.send_header('Connection', 'close')
@@ -360 +372 @@
         if value is None:
             return None
-        if isinstance(value, unicode):
+        if isinstance(value, text_type):
             value = value.encode('utf-8')
 
@@ -389 +401 @@
             try:
                 buf = input.read(n)
-            except (IOError, socket.error), e:
-                if _is_disconnected(req, e):
+            except (IOError, socket.error):
+                if _is_disconnected(req, _get_except()):
                     raise RequestDone
                 raise