Revert "Revert "pylint: upgrade to 1.3.1""

third_party/logilab/common/pyro_ext.py

 # copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of logilab-common.
 #
 # logilab-common is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation, either version 2.1 of the License, or (at your option) any
 # later version.
 #
@@ skipping 100 matching lines @@
     return daemon
 
 def get_object_uri(qnsid):
     return _PYRO_OBJS[qnsid]
 
 def ns_unregister(nsid, defaultnsgroup=_MARKER, nshost=None):
     """unregister the object with the given nsid from the pyro name server"""
     nsgroup, nsid = ns_group_and_id(nsid, defaultnsgroup)
     try:
         nsd = locate_ns(nshost)
-    except errors.PyroError, ex:
+    except errors.PyroError as ex:
         # name server not responding
         _LOGGER.error('can\'t locate pyro name server: %s', ex)
     else:
         try:
             nsd.unregister('%s.%s' % (nsgroup, nsid))
             _LOGGER.info('%s unregistered from pyro name server', nsid)
         except errors.NamingError:
             _LOGGER.warning('%s not registered in pyro name server', nsid)
 
 
@@ skipping 20 matching lines @@
 
 def ns_get_proxy(nsid, defaultnsgroup=_MARKER, nshost=None):
     """
     if nshost is None, the nameserver is found by a broadcast.
     """
     # resolve the Pyro object
     nsgroup, nsid = ns_group_and_id(nsid, defaultnsgroup)
     try:
         nsd = locate_ns(nshost)
         pyrouri = nsd.resolve('%s.%s' % (nsgroup, nsid))
-    except errors.ProtocolError, ex:
+    except errors.ProtocolError as ex:
         raise errors.PyroError(
             'Could not connect to the Pyro name server (host: %s)' % nshost)
     except errors.NamingError:
         raise errors.PyroError(
             'Could not get proxy for %s (not registered in Pyro), '
             'you may have to restart your server-side application' % nsid)
     return core.getProxyForURI(pyrouri)
 
 def get_proxy(pyro_uri):
     """get a proxy for the passed pyro uri without using a nameserver
     """
     return core.getProxyForURI(pyro_uri)
 
 def set_pyro_log_threshold(level):
     pyrologger = logging.getLogger('Pyro.%s' % str(id(util.Log)))
     # remove handlers so only the root handler is used
     pyrologger.handlers = []
     pyrologger.setLevel(level)