diff options
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/certdb.py | 8 | ||||
| -rw-r--r-- | ipapython/certmonger.py | 10 | ||||
| -rw-r--r-- | ipapython/config.py | 2 | ||||
| -rw-r--r-- | ipapython/cookie.py | 4 | ||||
| -rw-r--r-- | ipapython/dnsutil.py | 2 | ||||
| -rw-r--r-- | ipapython/dogtag.py | 4 | ||||
| -rw-r--r-- | ipapython/ipaldap.py | 14 | ||||
| -rw-r--r-- | ipapython/ipautil.py | 12 | ||||
| -rw-r--r-- | ipapython/log_manager.py | 4 | ||||
| -rw-r--r-- | ipapython/nsslib.py | 12 | ||||
| -rw-r--r-- | ipapython/sysrestore.py | 2 |
11 files changed, 37 insertions, 37 deletions
diff --git a/ipapython/certdb.py b/ipapython/certdb.py index e3238c846..d6de01100 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -178,7 +178,7 @@ class NSSDatabase(object): args = args + ["-w", paths.DEV_STDIN] try: ipautil.run(args, stdin=pkcs12_passwd) - except ipautil.CalledProcessError, e: + except ipautil.CalledProcessError as e: if e.returncode == 17: raise RuntimeError("incorrect password for pkcs#12 file %s" % pkcs12_filename) @@ -390,7 +390,7 @@ class NSSDatabase(object): try: self.run_certutil(["-M", "-n", root_nickname, "-t", trust_flags]) - except ipautil.CalledProcessError, e: + except ipautil.CalledProcessError as e: raise RuntimeError( "Setting trust on %s failed" % root_nickname) @@ -470,7 +470,7 @@ class NSSDatabase(object): intended_usage = nss.certificateUsageSSLServer try: approved_usage = cert.verify_now(certdb, True, intended_usage) - except NSPRError, e: + except NSPRError as e: if e.errno != -8102: raise ValueError(e.strerror) approved_usage = 0 @@ -504,7 +504,7 @@ class NSSDatabase(object): intended_usage = nss.certificateUsageSSLCA try: approved_usage = cert.verify_now(certdb, True, intended_usage) - except NSPRError, e: + except NSPRError as e: if e.errno != -8102: # SEC_ERROR_INADEQUATE_KEY_USAGE raise ValueError(e.strerror) approved_usage = 0 diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py index 3a2907d83..1371c215d 100644 --- a/ipapython/certmonger.py +++ b/ipapython/certmonger.py @@ -212,7 +212,7 @@ def get_request_value(request_id, directive): """ try: request = _get_request(dict(nickname=request_id)) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: @@ -240,7 +240,7 @@ def get_request_id(criteria): """ try: request = _get_request(criteria) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: @@ -270,7 +270,7 @@ def add_request_value(request_id, directive, value): """ try: request = _get_request({'nickname': request_id}) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: @@ -356,7 +356,7 @@ def start_tracking(nickname, secdir, password_file=None, command=None): if result[0]: request = _cm_dbus_object(cm.bus, cm, result[1], DBUS_CM_REQUEST_IF, DBUS_CM_IF, True) - except TypeError, e: + except TypeError as e: root_logger.error('Failed to add new request.') raise return request.prop_if.Get(DBUS_CM_REQUEST_IF, 'nickname') @@ -378,7 +378,7 @@ def stop_tracking(secdir, request_id=None, nickname=None): criteria['cert-nickname'] = nickname try: request = _get_request(criteria) - except RuntimeError, e: + except RuntimeError as e: root_logger.error('Failed to get request: %s' % e) raise if request: diff --git a/ipapython/config.py b/ipapython/config.py index 60f556dc9..8b6b5ac93 100644 --- a/ipapython/config.py +++ b/ipapython/config.py @@ -64,7 +64,7 @@ def check_ip_option(option, opt, value): def check_dn_option(option, opt, value): try: return DN(value) - except Exception, e: + except Exception as e: raise OptionValueError("option %s: invalid DN: %s" % (opt, e)) class IPAOption(Option): diff --git a/ipapython/cookie.py b/ipapython/cookie.py index aed312a3a..c12e0a127 100644 --- a/ipapython/cookie.py +++ b/ipapython/cookie.py @@ -185,7 +185,7 @@ class Cookie(object): try: dt = datetime.datetime(*email.utils.parsedate(s)[0:6]) - except Exception, e: + except Exception as e: raise ValueError("unable to parse expires datetime '%s': %s" % (s, e)) return dt @@ -594,7 +594,7 @@ class Cookie(object): from ipalib.util import validate_domain_name try: validate_domain_name(url_domain) - except Exception, e: + except Exception as e: return False if cookie_domain is None: diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py index f08cddad9..228cb6629 100644 --- a/ipapython/dnsutil.py +++ b/ipapython/dnsutil.py @@ -37,7 +37,7 @@ class DNSName(dns.name.Name): labels = labels.labels super(DNSName, self).__init__(labels) - except UnicodeError, e: + except UnicodeError as e: # dnspython bug, an invalid domain name returns the UnicodeError # instead of a dns.exception raise dns.exception.SyntaxError(e) diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py index 0782d360c..99bdf066d 100644 --- a/ipapython/dogtag.py +++ b/ipapython/dogtag.py @@ -163,7 +163,7 @@ def error_from_xml(doc, message_template): item_node = doc.getElementsByTagName("Error") reason = item_node[0].childNodes[0].data return errors.RemoteRetrieveError(reason=reason) - except Exception, e: + except Exception as e: return errors.RemoteRetrieveError(reason=message_template % e) @@ -332,7 +332,7 @@ def _httplib_request( http_headers = res.msg.dict http_body = res.read() conn.close() - except Exception, e: + except Exception as e: raise NetworkError(uri=uri, error=str(e)) root_logger.debug('request status %d', http_status) diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index ef7c41a37..3d38d6050 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -168,7 +168,7 @@ class SchemaCache(object): except ldap.SERVER_DOWN: raise errors.NetworkError(uri=url, error=u'LDAP Server Down, unable to retrieve LDAP schema') - except ldap.LDAPError, e: + except ldap.LDAPError as e: desc = e.args[0]['desc'].strip() info = e.args[0].get('info', '').strip() raise errors.DatabaseError(desc = u'uri=%s' % url, @@ -865,7 +865,7 @@ class LDAPClient(object): return datetime.datetime.strptime(val, LDAP_GENERALIZED_TIME_FORMAT) else: return target_type(val) - except Exception, e: + except Exception as e: msg = 'unable to convert the attribute %r value %r to type %s' % (attr, val, target_type) self.log.error(msg) raise ValueError(msg) @@ -927,7 +927,7 @@ class LDAPClient(object): yield except ldap.TIMEOUT: raise errors.DatabaseTimeout() - except ldap.LDAPError, e: + except ldap.LDAPError as e: desc = e.args[0]['desc'].strip() info = e.args[0].get('info', '').strip() if arg_desc is not None: @@ -984,7 +984,7 @@ class LDAPClient(object): raise errors.DatabaseError(desc=desc, info=info) except ldap.AUTH_UNKNOWN: raise errors.ACIError(info='%s (%s)' % (info,desc)) - except ldap.LDAPError, e: + except ldap.LDAPError as e: if 'NOT_ALLOWED_TO_DELEGATE' in info: raise errors.ACIError( info="KDC returned NOT_ALLOWED_TO_DELEGATE") @@ -1354,7 +1354,7 @@ class LDAPClient(object): break else: cookie = '' - except ldap.LDAPError, e: + except ldap.LDAPError as e: # If paged search is in progress, try to cancel it if paged_search and cookie: sctrls = [SimplePagedResultsControl(0, 0, cookie)] @@ -1363,7 +1363,7 @@ class LDAPClient(object): str(base_dn), scope, filter, attrs_list, serverctrls=sctrls, timeout=time_limit, sizelimit=size_limit) - except ldap.LDAPError, e: + except ldap.LDAPError as e: self.log.warning( "Error cancelling paged search: %s", e) cookie = '' @@ -1630,7 +1630,7 @@ class IPAdmin(LDAPClient): pw_name = pwd.getpwuid(os.geteuid()).pw_name self.do_external_bind(pw_name, timeout=timeout) return - except errors.NotFound, e: + except errors.NotFound as e: if autobind == AUTOBIND_ENABLED: # autobind was required and failed, raise # exception that it failed diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 05a7eebf0..280858ce7 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -803,7 +803,7 @@ def host_port_open(host, port, socket_type=socket.SOCK_STREAM, socket_timeout=No s.recv(512) return True - except socket.error, e: + except socket.error as e: pass finally: if s: @@ -824,14 +824,14 @@ def bind_port_responder(port, socket_type=socket.SOCK_STREAM, socket_timeout=Non try: addr_infos = socket.getaddrinfo(host, port, family, socket_type, 0, socket.AI_PASSIVE) - except socket.error, e: + except socket.error as e: last_socket_error = e continue for res in addr_infos: af, socktype, proto, canonname, sa = res try: s = socket.socket(af, socktype, proto) - except socket.error, e: + except socket.error as e: last_socket_error = e s = None continue @@ -870,7 +870,7 @@ def bind_port_responder(port, socket_type=socket.SOCK_STREAM, socket_timeout=Non # Timeout is expectable as it was requested by caller, raise # the exception back to him raise - except socket.error, e: + except socket.error as e: last_socket_error = e s.close() s = None @@ -1177,7 +1177,7 @@ def wait_for_open_socket(socket_name, timeout=0): s.connect(socket_name) s.close() break - except socket.error, e: + except socket.error as e: if e.errno in (2,111): # 111: Connection refused, 2: File not found if timeout and time.time() > op_timeout: # timeout exceeded raise e @@ -1298,7 +1298,7 @@ def restore_hostname(statestore): if old_hostname is not None and old_hostname != system_hostname: try: run([paths.BIN_HOSTNAME, old_hostname]) - except CalledProcessError, e: + except CalledProcessError as e: print >>sys.stderr, "Failed to set this machine hostname back to %s: %s" % (old_hostname, str(e)) diff --git a/ipapython/log_manager.py b/ipapython/log_manager.py index 9625bdfb7..cf3611e0f 100644 --- a/ipapython/log_manager.py +++ b/ipapython/log_manager.py @@ -936,7 +936,7 @@ class LogManager(object): if value is not None: try: level = parse_log_level(value) - except Exception, e: + except Exception as e: raise ValueError("could not set %s (%s)" % (attr, e)) setattr(self, attr, level) @@ -1239,7 +1239,7 @@ class LogManager(object): if level is not None: try: level = parse_log_level(level) - except Exception, e: + except Exception as e: print >>sys.stderr, 'could not set handler log level "%s" (%s)' % (level, e) level = None if level is None: diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py index def6b104e..1fb69cbd1 100644 --- a/ipapython/nsslib.py +++ b/ipapython/nsslib.py @@ -59,7 +59,7 @@ def auth_certificate_callback(sock, check_sig, is_server, certdb): # will be set to the error code matching the reason why the validation failed # and the strerror attribute will contain a string describing the reason. approved_usage = cert.verify_now(certdb, check_sig, intended_usage, *pin_args) - except Exception, e: + except Exception as e: root_logger.error('cert validation failed for "%s" (%s)', cert.subject, e.strerror) cert_is_valid = False return cert_is_valid @@ -88,7 +88,7 @@ def auth_certificate_callback(sock, check_sig, is_server, certdb): try: # If the cert fails validation it will raise an exception cert_is_valid = cert.verify_hostname(hostname) - except Exception, e: + except Exception as e: root_logger.error('failed verifying socket hostname "%s" matches cert subject "%s" (%s)', hostname, cert.subject, e.strerror) cert_is_valid = False @@ -159,7 +159,7 @@ class NSSAddressFamilyFallback(object): self._create_socket() self.sock.connect(net_addr) return - except Exception, e: + except Exception as e: root_logger.debug("Could not connect socket to %s, error: %s", net_addr, str(e)) root_logger.debug("Try to continue with next family...") @@ -199,7 +199,7 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback): ssl.clear_session_cache() try: nss.nss_shutdown() - except NSPRError, e: + except NSPRError as e: if e.errno != error.SEC_ERROR_NOT_INITIALIZED: raise e @@ -236,7 +236,7 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback): self.sock.set_ssl_option(ssl.SSL_HANDSHAKE_AS_CLIENT, True) try: self.sock.set_ssl_version_range(self.tls_version_min, self.tls_version_max) - except NSPRError, e: + except NSPRError as e: root_logger.error('Failed to set TLS range to %s, %s' % (self.tls_version_min, self.tls_version_max)) raise self.sock.set_ssl_option(ssl_require_safe_negotiation, False) @@ -289,7 +289,7 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback): httplib.HTTPConnection.endheaders(self) else: httplib.HTTPConnection.endheaders(self, message) - except NSPRError, e: + except NSPRError as e: self.close() raise e diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py index 935e4c6ce..a542b28c9 100644 --- a/ipapython/sysrestore.py +++ b/ipapython/sysrestore.py @@ -276,7 +276,7 @@ class FileStore: try: os.unlink(backup_path) - except Exception, e: + except Exception as e: root_logger.error('Error removing %s: %s' % (backup_path, str(e))) del self.files[filename] |