Commit 7d5944d9 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

py2/py3: use exception.args[] instead of exception[].

parent 1242a962
...@@ -390,14 +390,14 @@ class DB(TM): ...@@ -390,14 +390,14 @@ class DB(TM):
try: try:
self.db.query(query) self.db.query(query)
except OperationalError as m: except OperationalError as m:
if m[0] in query_syntax_error: if m.args[0] in query_syntax_error:
raise OperationalError(m[0], '%s: %s' % (m[1], query)) raise OperationalError(m.args[0], '%s: %s' % (m.args[1], query))
if m[0] in lock_error: if m.args[0] in lock_error:
raise ConflictError('%s: %s: %s' % (m[0], m[1], query)) raise ConflictError('%s: %s: %s' % (m.args[0], m.args[1], query))
if m[0] in query_timeout_error: if m.args[0] in query_timeout_error:
raise TimeoutReachedError('%s: %s: %s' % (m[0], m[1], query)) raise TimeoutReachedError('%s: %s: %s' % (m.args[0], m.args[1], query))
if (allow_reconnect or not self._use_TM) and \ if (allow_reconnect or not self._use_TM) and \
m[0] in hosed_connection: m.args[0] in hosed_connection:
self._forceReconnection() self._forceReconnection()
self.db.query(query) self.db.query(query)
else: else:
...@@ -414,8 +414,8 @@ class DB(TM): ...@@ -414,8 +414,8 @@ class DB(TM):
try: try:
return self.db.store_result() return self.db.store_result()
except OperationalError as m: except OperationalError as m:
if m[0] in query_timeout_error: if m.args[0] in query_timeout_error:
raise TimeoutReachedError('%s: %s: %s' % (m[0], m[1], query)) raise TimeoutReachedError('%s: %s: %s' % (m.args[0], m.args[1], query))
else: else:
raise raise
...@@ -518,7 +518,7 @@ class DB(TM): ...@@ -518,7 +518,7 @@ class DB(TM):
except OperationalError as m: except OperationalError as m:
LOG('ZMySQLDA', ERROR, "exception during _abort", LOG('ZMySQLDA', ERROR, "exception during _abort",
error=True) error=True)
if m[0] not in hosed_connection: if m.args[0] not in hosed_connection:
raise raise
def getMaxAllowedPacket(self): def getMaxAllowedPacket(self):
......
...@@ -137,7 +137,7 @@ class TestDeferredConnection(ERP5TypeTestCase): ...@@ -137,7 +137,7 @@ class TestDeferredConnection(ERP5TypeTestCase):
try: try:
self.commit() self.commit()
except OperationalError as m: except OperationalError as m:
if m[0] not in hosed_connection: if m.args[0] not in hosed_connection:
raise raise
else: else:
self.fail() self.fail()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment