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

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

parent 222133cb
...@@ -373,7 +373,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -373,7 +373,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
self.Base_zClearWorklistTable() self.Base_zClearWorklistTable()
except ProgrammingError as error_value: except ProgrammingError as error_value:
# 1146 = table does not exist # 1146 = table does not exist
if error_value[0] != 1146: if error_value.args[0] != 1146:
raise raise
self.Base_zCreateWorklistTable() self.Base_zCreateWorklistTable()
portal_catalog = self.getPortalObject().portal_catalog portal_catalog = self.getPortalObject().portal_catalog
...@@ -433,7 +433,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -433,7 +433,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
Base_zInsertIntoWorklistTable(**value_column_dict) Base_zInsertIntoWorklistTable(**value_column_dict)
except (ProgrammingError, OperationalError) as error_value: except (ProgrammingError, OperationalError) as error_value:
# OperationalError 1054 = unknown column # OperationalError 1054 = unknown column
if isinstance(error_value, OperationalError) and error_value[0] != 1054: if isinstance(error_value, OperationalError) and error_value.args[0] != 1054:
raise raise
LOG('WorkflowTool', WARNING, 'Insertion in worklist cache table ' \ LOG('WorkflowTool', WARNING, 'Insertion in worklist cache table ' \
'failed. Recreating table and retrying.', 'failed. Recreating table and retrying.',
...@@ -593,13 +593,13 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -593,13 +593,13 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
continue continue
except ProgrammingError as error_value: except ProgrammingError as error_value:
# 1146 = table does not exist # 1146 = table does not exist
if not use_cache or error_value[0] != 1146: if not use_cache or error_value.args[0] != 1146:
raise raise
try: try:
self.Base_zCreateWorklistTable() self.Base_zCreateWorklistTable()
except ProgrammingError as error_value: except ProgrammingError as error_value:
# 1050 = table exists (alarm run just a bit too late) # 1050 = table exists (alarm run just a bit too late)
if error_value[0] != 1050: if error_value.args[0] != 1050:
raise raise
if src__: if src__:
action_list.append(catalog_brain_result) action_list.append(catalog_brain_result)
......
...@@ -167,7 +167,7 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): ...@@ -167,7 +167,7 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase):
s.listen(0) s.listen(0)
except socket.error as e: except socket.error as e:
s.close() s.close()
if e[0] != errno.EADDRINUSE: if e.args[0] != errno.EADDRINUSE:
raise raise
if zserver: if zserver:
raise RuntimeError(str(e)) raise RuntimeError(str(e))
......
...@@ -405,14 +405,14 @@ class DB(TM): ...@@ -405,14 +405,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:
...@@ -420,7 +420,7 @@ class DB(TM): ...@@ -420,7 +420,7 @@ class DB(TM):
raise raise
except ProgrammingError as m: except ProgrammingError as m:
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:
...@@ -429,8 +429,8 @@ class DB(TM): ...@@ -429,8 +429,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
...@@ -533,7 +533,7 @@ class DB(TM): ...@@ -533,7 +533,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):
...@@ -585,7 +585,7 @@ class DB(TM): ...@@ -585,7 +585,7 @@ class DB(TM):
try: try:
old_list, old_set, old_default = self._getTableSchema("`%s`" % name) old_list, old_set, old_default = self._getTableSchema("`%s`" % name)
except ProgrammingError as e: except ProgrammingError as e:
if e[0] != ER.NO_SUCH_TABLE or not create_if_not_exists: if e.args[0] != ER.NO_SUCH_TABLE or not create_if_not_exists:
raise raise
if not src__: if not src__:
self.query(create_sql) self.query(create_sql)
......
...@@ -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