improve python3 support for #75

burpui/api/clients.py

@@ -9,6 +9,8 @@
 """
 from burpui.api import api
 from burpui.misc.backend.interface import BUIserverException
+
+from future.utils import iteritems
 from flask.ext.restful import reqparse, Resource
 from flask.ext.login import current_user, login_required
 from flask import jsonify, make_response
@@ -139,7 +141,7 @@ class RunningBackup(Resource):
                 j = [x for x in j if x in allowed]
         r = False
         if isinstance(j, dict):
-            for k, v in j.iteritems():
+            for (k, v) in iteritems(j):
                 if r:
                     break
                 r = r or (len(v) > 0)

burpui/api/misc.py

@@ -9,6 +9,8 @@
 """
 from burpui.api import api
 from burpui.misc.backend.interface import BUIserverException
+
+from future.utils import iteritems
 from flask.ext.restful import reqparse, Resource
 from flask.ext.login import current_user, login_required
 from flask import jsonify, render_template, make_response, abort
@@ -62,7 +64,7 @@ class RenderLiveTpl(Resource):
                 abort(404)
             else:
                 found = False
-                for k, a in api.bui.cli.running.iteritems():
+                for (k, a) in iteritems(api.bui.cli.running):
                     found = found or (name in a)
                 if not found:
                     abort(404)

burpui/api/servers.py

@@ -2,6 +2,8 @@
 
 from burpui.api import api
 from burpui.misc.backend.interface import BUIserverException
+
+from future.utils import iteritems
 from flask.ext.restful import reqparse, Resource
 from flask.ext.login import current_user, login_required
 from flask import jsonify
@@ -75,7 +77,7 @@ class Live(Resource):
         else:
             l = api.bui.cli.is_one_backup_running()
         if isinstance(l, dict):
-            for k, a in l.iteritems():
+            for (k, a) in iteritems(l):
                 for c in a:
                     s = {}
                     s['client'] = c

burpui/api/settings.py

@@ -7,12 +7,16 @@
 .. moduleauthor:: Ziirish <ziirish@ziirish.info>
 
 """
+import sys
 
 from burpui.api import api
 from flask.ext.restful import reqparse, abort, Resource
 from flask.ext.login import current_user, login_required
 from flask import jsonify, flash, request, redirect, url_for
-from urllib import unquote
+if sys.version_info >= (3, 0):
+    from urllib.parse import unquote
+else:
+    from urllib import unquote
 
 
 @api.resource('/api/server-config',

burpui/misc/auth/ldap.py

@@ -1,5 +1,6 @@
 # -*- coding: utf8 -*-
 from flask.ext.login import UserMixin
+from future.utils import viewitems
 from burpui.misc.auth.interface import BUIhandler, BUIuser
 
 import ssl
@@ -60,12 +61,12 @@ class LdapLoader:
         c = ConfigParser.ConfigParser(defaults)
         with open(conf) as fp:
             c.readfp(fp)
-            for opt, key in mapping.viewitems():
+            for (opt, key) in viewitems(mapping):
                 try:
                     setattr(self, opt, c.get('LDAP', key))
-                except ConfigParser.NoOptionError, e:
+                except ConfigParser.NoOptionError as e:
                     self.app.logger.info(str(e))
-                except ConfigParser.NoSectionError, e:
+                except ConfigParser.NoSectionError as e:
                     self.app.logger.error(str(e))
 
         if self.validate and self.validate.lower() in ['none', 'optional', 'required']:

burpui/misc/backend/burp1.py

@@ -9,6 +9,7 @@
 """
 import re
 import os
+import sys
 import socket
 import time
 import json
@@ -22,8 +23,12 @@ import subprocess
 import tempfile
 import codecs
 
+from future.utils import iteritems
 from pipes import quote
-from urllib import unquote
+if sys.version_info >= (3, 0):
+    from urllib.parse import unquote
+else:
+    from urllib import unquote
 
 from burpui.misc.utils import human_readable as _hr, BUIlogging, BUIcompress
 from burpui.misc.backend.interface import BUIbackend, BUIserverException
@@ -563,7 +568,7 @@ class Burp(BUIbackend, BUIlogging):
 
             found = False
             # this method is not optimal, but it is easy to read and to maintain
-            for key, regex in lookup_easy.iteritems():
+            for (key, regex) in iteritems(lookup_easy):
                 r = re.search(regex, line)
                 if r:
                     found = True
@@ -592,7 +597,7 @@ class Burp(BUIbackend, BUIlogging):
             if found:
                 continue
 
-            for key, regex in lookup_complex.iteritems():
+            for (key, regex) in iteritems(lookup_complex):
                 r = re.search(regex, line)
                 if r:
                     # self._logger('debug', "match[1]: '{0}'".format(r.group(1)))

burpui/misc/backend/burp2.py

@@ -19,6 +19,7 @@ import codecs
 import signal
 import sys
 
+from future.utils import iteritems
 from pipes import quote
 from select import select
 
@@ -374,7 +375,7 @@ class Burp(Burp1):
                 backup[name] = counter['count']
             else:
                 backup[name] = {}
-                for k, v in counts.iteritems():
+                for (k, v) in iteritems(counts):
                     if v in counter:
                         backup[name][k] = counter[v]
                     else:

burpui/misc/backend/multi.py

@@ -16,6 +16,8 @@ try:
 except ImportError:
     import configparser as ConfigParser
 
+from future.utils import iteritems
+
 from burpui.misc.backend.interface import BUIbackend, BUIserverException
 from burpui.misc.utils import BUIlogging
 
@@ -52,7 +54,7 @@ class Burp(BUIbackend,BUIlogging):
                         self.servers[r.group(1)] = NClient(self.app, host, port, password, ssl, timeout)
 
         self.app.logger.debug(self.servers)
-        for key, serv in self.servers.iteritems():
+        for (key, serv) in iteritems(self.servers):
             self.app.config['SERVERS'].append(key)
 
     """

burpui/routes.py

@@ -1,9 +1,13 @@
 # -*- coding: utf8 -*-
 import math
+import sys
 
 from flask import request, render_template, jsonify, redirect, url_for, abort, flash, Blueprint
 from flask.ext.login import login_user, login_required, logout_user, current_user
-from urllib import quote
+if sys.version_info >= (3, 0):
+    from urllib.parse import quote
+else:
+    from urllib import quote
 
 from burpui.forms import LoginForm
 from burpui.misc.utils import human_readable as _hr

requirements.txt

@@ -3,3 +3,4 @@ Flask-Login==0.2.11
 Flask-WTF==0.10.0
 Flask-RESTful==0.3.2
 WTForms==2.0.1
+future