Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Commit

Permalink
Fix obsolete catch tuple syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
@creachadair
creachadair committed Jul 22, 2020
1 parent 98557c1 commit ee7ba69
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions dnd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def __init__(self, **config):
try:
self._conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._conn.connect((server, port))
except socket.error, e:
except socket.error as e:
raise DNDError(str(e))

self._saddr = self._conn.getpeername()
Expand Down Expand Up @@ -796,7 +796,7 @@ def _rawsend(self, data):

try:
self._conn.send(data)
except socket.error, e:
except socket.error as e:
if e[0] == errno.EPIPE:
self._close()
raise DNDLostConnection("broken pipe")
Expand All @@ -814,7 +814,7 @@ def __contains__(self, query):

try:
return self._lookup(query) > 0
except DNDError, e:
except DNDError as e:
return False

def __getitem__(self, query):
Expand All @@ -827,7 +827,7 @@ def _readline(self):
"""
try:
line = self._input.readline()
except socket.error, e:
except socket.error as e:
if e[0] == errno.ECONNRESET:
self._close()
raise DNDLostConnection("connection closed by remote host")
Expand Down
38 changes: 19 additions & 19 deletions test_dnd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def run(self):
while self._more:
try:
cmd, data = self._readline()
except ValueError, e:
except ValueError as e:
self._diag('- error: %s', e)
break

Expand All @@ -67,7 +67,7 @@ def run(self):
handler(cmd, data)
else:
self.h_default(cmd, data)
except ValueError, e:
except ValueError as e:
self._diag('- error: %s', e)
break

Expand Down Expand Up @@ -121,7 +121,7 @@ def _close(self):
def _readline(self):
try:
line = self._input.readline()
except socket.error, e:
except socket.error as e:
if e[0] == errno.ECONNRESET:
self._close()
raise ValueError("connection closed by remote host")
Expand All @@ -142,7 +142,7 @@ def _readline(self):
def _rawsend(self, data):
try:
self._client.send(data)
except socket.error, e:
except socket.error as e:
if e[0] == errno.EPIPE:
self._close()
raise ValueError("broken pipe")
Expand Down Expand Up @@ -354,13 +354,13 @@ def runTest(self):
self._dnd = dnd.DNDSession(server=self.host_name,
port=self.host_port)
d = self._dnd
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('unable to create test DNDSession: %s' % e)

# Look up all the field keys
try:
fld = d.fieldinfo()
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in fieldinfo: %s' % e)

self.assertEquals(len(fld), 16)
Expand All @@ -387,13 +387,13 @@ def runTest(self):
self.fail('missing user did not raise DNDProtocolError')
except dnd.DNDProtocolError:
pass
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('missing user raised an unexpected error: %s' % e)

# Make sure the 'additional records' message is handled...
try:
rec = d.lookup('excessive', 'field1', 'field9')
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in lookup: %s' % e)

self.assertEquals(len(rec), 25)
Expand All @@ -404,7 +404,7 @@ def runTest(self):
# Make sure a unique user is really unique...
try:
rec = d.lookup('unique', 'field1', 'field13', 'field9')
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in lookup: %s' % e)

self.assertEquals(len(rec), 1)
Expand All @@ -420,69 +420,69 @@ def runTest(self):
# Make sure validation works correctly
try:
chal, resp = d.begin_validate('unique', 'field1', 'field2')
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in begin_validate: %s' % e)

try:
rec = resp('testpass', False)
self.assertEqual(len(rec), 2)
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in validate responder: %s' % e)

try:
chal, resp = d.begin_validate('unique')
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in begin_validate: %s' % e)

try:
rec = resp('testpass', False)
self.assertTrue(rec)
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in validate responder: %s' % e)

try:
d.begin_validate('missing')
self.fail('missing user did not generate DNDProtocolError')
except dnd.DNDProtocolError:
pass
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in begin_validate: %s' % e)

try:
d.validate('ambiguous', 'irrelevant password')
self.fail('ambiguous user did not generate DNDProtocolError')
except dnd.DNDProtocolError:
pass
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in validation: %s' % e)

try:
d.validate('unique', 'wrongpw', 'field1')
self.fail('wrong password did not generate DNDProtocolError')
except dnd.DNDProtocolError:
pass
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in validation: %s' % e)

try:
d.lookup('ambiguous', 'field1', 'nosuchfield')
self.fail('unknown field did not generate DNDProtocolError')
except dnd.DNDProtocolError:
pass
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in lookup: %s' % e)

try:
d.lookup('ambiguous', 'field1', 'field13', 'field7')
self.fail('inaccessible field did not generate DNDProtocolError')
except dnd.DNDProtocolError:
pass
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in lookup: %s' % e)

try:
d.keep_alive()
except dnd.DNDError, e:
except dnd.DNDError as e:
self.fail('error in keep_alive: %s' % e)


Expand Down

0 comments on commit ee7ba69

Please sign in to comment.