From 1c7419c9920b70c22bbeefe00f3e11aed6c6ffbd Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Mon, 21 Oct 2019 17:47:30 +0100 Subject: [PATCH] *.py: Upgrade old-fashioned `raise' syntax. --- algorithms.py | 2 +- catacomb/__init__.py | 16 ++++++++-------- catacomb/pwsafe.py | 41 ++++++++++++++++++++--------------------- pwsafe | 6 +++--- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/algorithms.py b/algorithms.py index 5730c45..35c8874 100644 --- a/algorithms.py +++ b/algorithms.py @@ -92,7 +92,7 @@ for i in latindances: root = r break else: - raise ValueError, 'failed to find root name for %s' % i + raise ValueError('failed to find root name for %s' % i) if i.endswith('-ietf'): root += '_ietf' print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' + 'RNG_LATIN, %(ROOT)s_NONCESZ) \\') % \ diff --git a/catacomb/__init__.py b/catacomb/__init__.py index c810c42..80b6095 100644 --- a/catacomb/__init__.py +++ b/catacomb/__init__.py @@ -124,7 +124,7 @@ def _augment(c, cc): def _checkend(r): x, rest = r if rest != '': - raise SyntaxError, 'junk at end of string' + raise SyntaxError('junk at end of string') return x ## Some pretty-printing utilities. @@ -604,11 +604,11 @@ class _tmp: pp.end_group(ind, ')') def check(me, sz): return me.min <= sz <= me.max and sz%me.mod == 0 def best(me, sz): - if sz < me.min: raise ValueError, 'key too small' + if sz < me.min: raise ValueError('key too small') elif sz > me.max: return me.max else: return sz - sz%me.mod def pad(me, sz): - if sz > me.max: raise ValueError, 'key too large' + if sz > me.max: raise ValueError('key too large') elif sz < me.min: return me.min else: sz += me.mod - 1; return sz - sz%me.mod _augment(KeySZRange, _tmp) @@ -630,13 +630,13 @@ class _tmp: found = -1 for i in me.set: if found < i <= sz: found = i - if found < 0: raise ValueError, 'key too small' + if found < 0: raise ValueError('key too small') return found def pad(me, sz): found = -1 for i in me.set: if sz <= i and (found == -1 or i < found): found = i - if found < 0: raise ValueError, 'key too large' + if found < 0: raise ValueError('key too large') return found _augment(KeySZSet, _tmp) @@ -916,7 +916,7 @@ Z128 = ByteString.zero(16) class _BasePub (object): def __init__(me, pub, *args, **kw): - if not me._PUBSZ.check(len(pub)): raise ValueError, 'bad public key' + if not me._PUBSZ.check(len(pub)): raise ValueError('bad public key') super(_BasePub, me).__init__(*args, **kw) me.pub = pub def __repr__(me): return '%s(pub = %r)' % (_clsname(me), me.pub) @@ -929,7 +929,7 @@ class _BasePub (object): class _BasePriv (object): def __init__(me, priv, pub = None, *args, **kw): - if not me._KEYSZ.check(len(priv)): raise ValueError, 'bad private key' + if not me._KEYSZ.check(len(priv)): raise ValueError('bad private key') if pub is None: pub = me._pubkey(priv) super(_BasePriv, me).__init__(pub = pub, *args, **kw) me.priv = priv @@ -1122,7 +1122,7 @@ class SimulStepper (PrimeGenEventHandler): me.add = add def _stepfn(me, step): if step <= 0: - raise ValueError, 'step must be positive' + raise ValueError('step must be positive') if step <= MPW_MAX: return lambda f: f.step(step) j = PrimeFilter(step) diff --git a/catacomb/pwsafe.py b/catacomb/pwsafe.py index bc8c038..7740212 100644 --- a/catacomb/pwsafe.py +++ b/catacomb/pwsafe.py @@ -339,9 +339,9 @@ class StorageBackend (object): `_open' method, which is invoked in the usual case. """ super(StorageBackend, me).__init__(*args, **kw) - if me.NAME is None: raise ValueError, 'abstract class' + if me.NAME is None: raise ValueError('abstract class') if _magic is not None: _magic(me) - elif file is None: raise ValueError, 'missing file parameter' + elif file is None: raise ValueError('missing file parameter') else: me._open(file, writep) me._writep = writep me._livep = True @@ -361,12 +361,12 @@ class StorageBackend (object): def _check_live(me): """Raise an error if the receiver has been closed.""" - if not me._livep: raise ValueError, 'database is closed' + if not me._livep: raise ValueError('database is closed') def _check_write(me): """Raise an error if the receiver is not open for writing.""" me._check_live() - if not me._writep: raise ValueError, 'database is read-only' + if not me._writep: raise ValueError('database is read-only') def _check_meta_name(me, name): """ @@ -376,7 +376,7 @@ class StorageBackend (object): password storage. """ if name.startswith('$'): - raise ValueError, "invalid metadata key `%s'" % name + raise ValueError("invalid metadata key `%s'" % name) ## Context protocol. @@ -403,7 +403,7 @@ class StorageBackend (object): me._check_meta_name(name) me._check_live() value = me._get_meta(name, default) - if value is StorageBackend.FAIL: raise KeyError, name + if value is StorageBackend.FAIL: raise KeyError(name) return value def put_meta(me, name, value): @@ -501,7 +501,7 @@ else: def _open(me, file, writep): try: me._db = _G.open(file, writep and 'w' or 'r') - except _G.error, e: raise StorageBackendRefusal, e + except _G.error, e: raise StorageBackendRefusal(e) def _create(me, file): me._db = _G.open(file, 'n', 0600) @@ -565,12 +565,11 @@ else: "SELECT value FROM meta WHERE name = '$version'", "version check") except (_Q.DatabaseError, _Q.OperationalError), e: - raise StorageBackendRefusal, e - if ver is None: raise ValueError, 'database broken (missing $version)' + raise StorageBackendRefusal(e) + if ver is None: raise ValueError('database broken (missing $version)') elif ver < me.VERSION: me._upgrade(ver) - elif ver > me.VERSION: - raise ValueError, 'unknown database schema version (%d > %d)' % \ - (ver, me.VERSION) + elif ver > me.VERSION: raise ValueError \ + ('unknown database schema version (%d > %d)' % (ver, me.VERSION)) def _create(me, file): fd = _OS.open(file, _OS.O_WRONLY | _OS.O_CREAT | _OS.O_EXCL, 0600) @@ -611,7 +610,7 @@ else: else: val, = row try: row = next(c) except StopIteration: pass - else: raise ValueError, 'multiple matching records for %s' % what + else: raise ValueError('multiple matching records for %s' % what) return val def _query_scalar(me, query, what, default = None, args = []): @@ -634,7 +633,7 @@ else: def _del_meta(me, name): c = me._db.cursor() c.execute("DELETE FROM meta WHERE name = ?", [name]) - if not c.rowcount: raise KeyError, name + if not c.rowcount: raise KeyError(name) def _iter_meta(me): c = me._db.cursor() @@ -645,7 +644,7 @@ else: pld = me._query_scalar("SELECT payload FROM passwd WHERE label = ?", "password", default = None, args = [buffer(label)]) - if pld is None: raise KeyError, label + if pld is None: raise KeyError(label) return str(pld) def _put_passwd(me, label, payload): @@ -657,7 +656,7 @@ else: def _del_passwd(me, label): c = me._db.cursor() c.execute("DELETE FROM passwd WHERE label = ?", [label]) - if not c.rowcount: raise KeyError, label + if not c.rowcount: raise KeyError(label) def _iter_passwds(me): c = me._db.cursor() @@ -928,7 +927,7 @@ class DirectoryStorageBackend (PlainTextBackend): try: f = open(me._pwfile(label), 'rb') except (OSError, IOError), e: - if e.errno == _E.ENOENT: raise KeyError, label + if e.errno == _E.ENOENT: raise KeyError(label) else: raise with f: return f.read() def _put_passwd(me, label, payload): @@ -941,7 +940,7 @@ class DirectoryStorageBackend (PlainTextBackend): try: _OS.remove(me._pwfile(label)) except (OSError, IOError), e: - if e.errno == _E.ENOENT: raise KeyError, label + if e.errno == _E.ENOENT: raise KeyError(label) else: raise def _iter_passwds(me): pw = _OS.path.join(me._dir, 'pw') @@ -1014,7 +1013,7 @@ class PW (object): raise me.ck = b.getblk16() me.mk = b.getblk16() - if not b.endp: raise ValueError, 'trailing junk' + if not b.endp: raise ValueError('trailing junk') ## Set the key, and stash it and the tag-hashing secret. me.k = Crypto(c, h, m, me.ck, me.mk) @@ -1092,7 +1091,7 @@ class PW (object): def __getitem__(me, key): """Return the password for the given KEY.""" try: return me.unpack(me.db.get_passwd(me.keyxform(key)))[1] - except KeyError: raise KeyError, key + except KeyError: raise KeyError(key) def __setitem__(me, key, value): """Associate the password VALUE with the KEY.""" @@ -1101,7 +1100,7 @@ class PW (object): def __delitem__(me, key): """Forget all about the KEY.""" try: me.db.del_passwd(me.keyxform(key)) - except KeyError: raise KeyError, key + except KeyError: raise KeyError(key) def __iter__(me): """Iterate over the known password tags.""" diff --git a/pwsafe b/pwsafe index 9de0b31..3e981cd 100644 --- a/pwsafe +++ b/pwsafe @@ -75,7 +75,7 @@ def cmd_create(av): elif o in ('-m', '--mac'): mac = a elif o in ('-h', '--hash'): hash = a elif o in ('-d', '--database'): dbty = a - else: raise 'Barf!' + else: raise Exception("barf") if len(args) > 2: return 1 if len(args) >= 1: tag = args[0] else: tag = 'pwsafe' @@ -155,7 +155,7 @@ def cmd_xfer(av): dbty = 'flat' for o, a in opts: if o in ('-d', '--database'): dbty = a - else: raise 'Barf!' + else: raise Exception("barf") if len(args) != 1: return 1 try: dbcls = StorageBackend.byname(dbty) except KeyError: die("Unknown database backend `%s'" % dbty) @@ -234,7 +234,7 @@ for o, a in opts: elif o in ('-f', '--file'): file = a else: - raise 'Barf!' + raise Exception("barf") if len(argv) < 1: usage(stderr) exit(1) -- 2.11.0