Revert "Revert "pylint: upgrade to 1.3.1""

third_party/logilab/common/corbautils.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 54 matching lines @@
     is mapped to
     'corbaname::hostname#logilab.rootmodule/chatbot.application/chatter.server'
 
     The get_object_reference() function can be used to resolve such a URL.
     """
     context = get_root_context()
     for id, kind in namepath[:-1]:
         name = [CosNaming.NameComponent(id, kind)]
         try:
             context = context.bind_new_context(name)
-        except CosNaming.NamingContext.AlreadyBound, ex:
+        except CosNaming.NamingContext.AlreadyBound as ex:
             context = context.resolve(name)._narrow(CosNaming.NamingContext)
             assert context is not None, \
                    'test context exists but is not a NamingContext'
 
     id, kind = namepath[-1]
     name = [CosNaming.NameComponent(id, kind)]
     try:
         context.bind(name, object._this())
-    except CosNaming.NamingContext.AlreadyBound, ex:
+    except CosNaming.NamingContext.AlreadyBound as ex:
         context.rebind(name, object._this())
 
 def activate_POA():
     """
     This methods activates the Portable Object Adapter.
     You need to call it to enable the reception of messages in your code,
     on both the client and the server.
     """
     orb = get_orb()
     poa = orb.resolve_initial_references('RootPOA')
@@ skipping 13 matching lines @@
     See register_object_name() for examples URLs
     """
     return get_orb().string_to_object(url)
 
 def get_object_string(host, namepath):
     """given an host name and a name path as described in register_object_name,
     return a corba string identifier
     """
     strname = '/'.join(['.'.join(path_elt) for path_elt in namepath])
     return 'corbaname::%s#%s' % (host, strname)