few Python 3 related fixes

* do not use 'print' use 'twisted.python.log'
* use 'except ... as ...' instead of 'except ..., ...'

master/buildbot/mq/wamp.py

@@ -58,7 +58,7 @@ def _produce(self, routingKey, data):
 
     def startConsuming(self, callback, _filter, persistent_name=None):
         if persistent_name is not None:
-            print "wampmq: persistant queues are not persisted!", persistent_name, _filter
+            log.err('wampmq: persistant queues are not persisted: %s %s' % (persistent_name, _filter))
 
         qr = QueueRef(callback)
 

master/buildbot/test/unit/test_www_authz.py

@@ -107,8 +107,8 @@ def assertUserAllowed(self, ep, action, options, user):
     def assertUserForbidden(self, ep, action, options, user):
         try:
             yield self.authz.assertUserAllowed(tuple(ep.split("/")), action, options, self.users[user])
-        except authz.Forbidden, e:
-            self.assertIn("need to have role", repr(e))
+        except authz.Forbidden as err:
+            self.assertIn('need to have role', repr(err))
 
     @defer.inlineCallbacks
     def test_anyEndpoint(self):

master/buildbot/www/oauth2.py

@@ -15,9 +15,11 @@
 from posixpath import join
 
 import requests
+
 from future.moves.urllib.parse import parse_qs
 from future.moves.urllib.parse import urlencode
 from future.utils import iteritems
+
 from twisted.internet import defer
 from twisted.internet import threads
 
@@ -51,7 +53,6 @@ def renderLogin(self, request):
                 details.update(infos)
             request.getSession().user_info = details
             state = request.args.get("state", [""])[0]
-            print repr(state)
             if state:
                 for redirect in parse_qs(state).get('redirect', []):
                     raise resource.Redirect(self.auth.homeUri + "#" + redirect)