dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

running lib2to3.fixes.fix_except

Browse Source
This commit is contained in:
ilvalle committed 2016-05-29 08:31:19 +02:00
1 parent 14830e8906
commit 35900da19b
35 files changed
+93 -92
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gluon/contrib/AuthorizeNet.py
+1 -1
View File
@@ -259,7 +259,7 @@ def test():
print 'Your credit card was declined by your bank'
elif payment.isError():
raise AIM.AIMError('An uncaught error occurred')
except AIM.AIMError, e:
except AIM.AIMError as e:
print "Exception thrown:", e
print 'An error occured'
print 'approved', payment.isApproved()
gluon/contrib/DowCommerce.py
+1 -1
View File
@@ -233,7 +233,7 @@ def test():
print 'Your credit card was declined by your bank'
elif payment.isError():
raise DowCommerce.DowCommerceError('An uncaught error occurred')
except DowCommerce.DowCommerceError, e:
except DowCommerce.DowCommerceError as e:
print "Exception thrown:", e
print 'An error occured'
print 'approved', payment.isApproved()
gluon/contrib/gae_retry.py
+1 -1
View File
@@ -69,7 +69,7 @@ def autoretry_datastore_timeouts(attempts=5.0, interval=0.1, exponent=2.0):
while True:
try:
return wrapped(*args, **kwargs)
except apiproxy_errors.ApplicationError, err:
except apiproxy_errors.ApplicationError as err:
errno = err.application_error
if errno not in errors:
raise
gluon/contrib/gateways/fcgi.py
+7 -7
View File
@@ -470,7 +470,7 @@ class Record(object):
while length:
try:
data = sock.recv(length)
except socket.error, e:
except socket.error as e:
if e[0] == errno.EAGAIN:
select.select([sock], [], [])
continue
@@ -527,7 +527,7 @@ class Record(object):
while length:
try:
sent = sock.send(data)
except socket.error, e:
except socket.error as e:
if e[0] == errno.EAGAIN:
select.select([], [sock], [])
continue
@@ -664,7 +664,7 @@ class Connection(object):
self.process_input()
except EOFError:
break
except (select.error, socket.error), e:
except (select.error, socket.error) as e:
if e[0] == errno.EBADF: # Socket was closed by Request.
break
raise
@@ -990,7 +990,7 @@ class Server(object):
socket.SOCK_STREAM)
try:
sock.getpeername()
except socket.error, e:
except socket.error as e:
if e[0] == errno.ENOTSOCK:
# Not a socket, assume CGI context.
isFCGI = False
@@ -1077,7 +1077,7 @@ class Server(object):
while self._keepGoing:
try:
r, w, e = select.select([sock], [], [], timeout)
except select.error, e:
except select.error as e:
if e[0] == errno.EINTR:
continue
raise
@@ -1085,7 +1085,7 @@ class Server(object):
if r:
try:
clientSock, addr = sock.accept()
except socket.error, e:
except socket.error as e:
if e[0] in (errno.EINTR, errno.EAGAIN):
continue
raise
@@ -1273,7 +1273,7 @@ class WSGIServer(Server):
finally:
if hasattr(result, 'close'):
result.close()
except socket.error, e:
except socket.error as e:
if e[0] != errno.EPIPE:
raise # Don't let EPIPE propagate beyond server
finally:
gluon/contrib/generics.py
+3 -3
View File
@@ -14,11 +14,11 @@ def wrapper(f):
try:
output = f(data)
return XML(ouput)
except (TypeError, ValueError), e:
except (TypeError, ValueError) as e:
raise HTTP(405, '%s serialization error' % e)
except ImportError, e:
except ImportError as e:
raise HTTP(405, '%s not available' % e)
except Exception, e:
except Exception as e:
raise HTTP(405, '%s error' % e)
return g
gluon/contrib/hypermedia.py
+1 -1
View File
@@ -305,7 +305,7 @@ class Collection(object):
response.headers['location'] = \
URL(args=(tablename,res.id),scheme=True)
return ''
except SyntaxError,e: #Exception,e:
except SyntaxError as e: #Exception,e:
db.rollback()
return self.error(400,'BAD REQUEST','Invalid Query:'+e)
gluon/contrib/login_methods/ldap_auth.py
+11 -11
View File
@@ -9,7 +9,7 @@ try:
import ldap
import ldap.filter
ldap.set_option(ldap.OPT_REFERRALS, 0)
except Exception, e:
except Exception as e:
logging.error('missing ldap, try "easy_install python-ldap"')
raise e
@@ -357,7 +357,7 @@ def ldap_auth(server='ldap',
con.simple_bind_s(user_dn, password)
found = True
break
except ldap.LDAPError, detail:
except ldap.LDAPError as detail:
(exc_type, exc_value) = sys.exc_info()[:2]
logger.warning("ldap_auth: searching %s for %s resulted in %s: %s\n" % (basedn,
filter,
@@ -392,7 +392,7 @@ def ldap_auth(server='ldap',
con.simple_bind_s(user_dn, password)
found = True
break
except ldap.LDAPError, detail:
except ldap.LDAPError as detail:
(exc_type, exc_value) = sys.exc_info()[:2]
logger.warning("ldap_auth: searching %s for %s resulted in %s: %s\n" % (basedn,
filter,
@@ -410,18 +410,18 @@ def ldap_auth(server='ldap',
store_user_firstname = result[user_firstname_attrib][0].split(' ', 1)[user_firstname_part]
else:
store_user_firstname = result[user_firstname_attrib][0]
except KeyError, e:
except KeyError as e:
store_user_firstname = None
try:
if user_lastname_part is not None:
store_user_lastname = result[user_lastname_attrib][0].split(' ', 1)[user_lastname_part]
else:
store_user_lastname = result[user_lastname_attrib][0]
except KeyError, e:
except KeyError as e:
store_user_lastname = None
try:
store_user_mail = result[user_mail_attrib][0]
except KeyError, e:
except KeyError as e:
store_user_mail = None
update_or_insert_values = {'first_name': store_user_firstname,
'last_name': store_user_lastname,
@@ -451,14 +451,14 @@ def ldap_auth(server='ldap',
if not do_manage_groups(username, password, group_mapping):
return False
return True
except ldap.INVALID_CREDENTIALS, e:
except ldap.INVALID_CREDENTIALS as e:
return False
except ldap.LDAPError, e:
except ldap.LDAPError as e:
import traceback
logger.warning('[%s] Error in ldap processing' % str(username))
logger.debug(traceback.format_exc())
return False
except IndexError, ex: # for AD membership test
except IndexError as ex: # for AD membership test
import traceback
logger.warning('[%s] Ldap result indexing error' % str(username))
logger.debug(traceback.format_exc())
@@ -518,14 +518,14 @@ def ldap_auth(server='ldap',
except:
try:
db_user_id = db(db.auth_user.email == username).select(db.auth_user.id).first().id
except AttributeError, e:
except AttributeError as e:
#
# There is no user in local db
# We create one
# ##############################
try:
db_user_id = db.auth_user.insert(username=username, first_name=username)
except AttributeError, e:
except AttributeError as e:
db_user_id = db.auth_user.insert(email=username, first_name=username)
if not db_user_id:
logging.error(
gluon/contrib/login_methods/oauth20_account.py
+2 -2
View File
@@ -174,7 +174,7 @@ server for requests. It can be used for the optional"scope" parameters for Face
opener = self.__build_url_opener(self.token_url)
try:
open_url = opener.open(self.token_url, urlencode(data), self.socket_timeout)
except urllib2.HTTPError, e:
except urllib2.HTTPError as e:
tmp = e.read()
raise Exception(tmp)
finally:
@@ -190,7 +190,7 @@ server for requests. It can be used for the optional"scope" parameters for Face
try:
tokendata = json.loads(data)
current.session.token = tokendata
except Exception, e:
except Exception as e:
raise Exception("Cannot parse oauth server response %s %s" % (data, e))
else: # try facebook style first with x-www-form-encoded
tokendata = cgi.parse_qs(data)
gluon/contrib/login_methods/openid_auth.py
+1 -1
View File
@@ -44,7 +44,7 @@ try:
from openid.extensions.sreg import SRegRequest, SRegResponse
from openid.store import nonce
from openid.consumer.discover import DiscoveryFailure
except ImportError, err:
except ImportError as err:
raise ImportError("OpenIDAuth requires python-openid package")
DEFAULT = lambda: None
gluon/contrib/login_methods/saml2_auth.py
+1 -1
View File
@@ -133,7 +133,7 @@ def saml2_handler(session, request, config_filename = None):
data = client.parse_authn_request_response(
unquoted_response, binding, session.saml_outstanding_queries)
res['response'] = data if data else {}
except Exception, e:
except Exception as e:
import traceback
res['error'] = traceback.format_exc()
return res
gluon/contrib/markmin/markmin2html.py
+1 -1
View File
@@ -650,7 +650,7 @@ def replace_components(text, env):
pass
try:
f = f(**b) if isinstance(b, dict) else f(b)
except Exception, e:
except Exception as e:
f = 'ERROR: %s' % e
return str(f)
gluon/contrib/markmin/markmin2pdf.py
+2 -1
View File
@@ -20,7 +20,8 @@ def removeall(path):
def rmgeneric(path, __func__):
try:
__func__(path)
except OSError, (errno, strerror):
except OSError as xxx_todo_changeme:
(errno, strerror) = xxx_todo_changeme.args
print ERROR_STR % {'path': path, 'error': strerror}
files = [path]
gluon/contrib/qdb.py
+3 -3
View File
@@ -69,7 +69,7 @@ class Qdb(bdb.Bdb):
method = getattr(self, request['method'])
response['result'] = method.__call__(*request['args'],
**request.get('kwargs', {}))
except Exception, e:
except Exception as e:
response['error'] = {'code': 0, 'message': str(e)}
# send the result for normal method calls, not for notifications
if request.get('id'):
@@ -259,7 +259,7 @@ class Qdb(bdb.Bdb):
try:
self.frame.f_lineno = arg
return arg
except ValueError, e:
except ValueError as e:
print '*** Jump failed:', e
return False
@@ -375,7 +375,7 @@ class Qdb(bdb.Bdb):
"Return list of auto-completion options for expression"
try:
obj = self.do_eval(expression)
except Exception, e:
except Exception as e:
return ('', '', str(e))
else:
name = ''
gluon/contrib/shell.py
+1 -1
View File
@@ -259,7 +259,7 @@ def run(history, statement, env={}):
if not name.startswith('__'):
try:
history.set_global(name, val)
except (TypeError, pickle.PicklingError), ex:
except (TypeError, pickle.PicklingError) as ex:
UNPICKLABLE_TYPES.append(type(val))
history.add_unpicklable(statement, new_globals.keys())
gluon/contrib/spreadsheet.py
+2 -2
View File
@@ -255,7 +255,7 @@ class Sheet:
try:
r, c = Sheet.pregex.findall(key)
r, c = int(r), int(c)
except (ValueError, IndexError, TypeError), e:
except (ValueError, IndexError, TypeError) as e:
error = "%s. %s" % \
("Unexpected position parameter",
"Must be a key of type 'rncn'")
@@ -742,7 +742,7 @@ class Sheet:
exec('__value__=' + node.value[1:], {}, self.environment)
node.computed_value = self.environment['__value__']
del self.environment['__value__']
except Exception, e:
except Exception as e:
node.computed_value = self.error % dict(error=str(e))
self.environment[node.name] = node.computed_value
if node.onchange:
gluon/contrib/webclient.py
+1 -1
View File
@@ -126,7 +126,7 @@ class WebClient(object):
t0 = time.time()
self.response = opener.open(self.url, data)
self.time = time.time() - t0
except urllib2.HTTPError, error:
except urllib2.HTTPError as error:
# catch HTTP errors
self.time = time.time() - t0
self.response = error