From 1e3d2d24bba1472b6e259e141f3ae8775f103b6a Mon Sep 17 00:00:00 2001 From: j Date: Sat, 4 Jun 2016 00:39:01 +0200 Subject: [PATCH] raise Exception(...) --- ox/torrent/bencode.py | 8 ++++---- ox/web/auth.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ox/torrent/bencode.py b/ox/torrent/bencode.py index 611c531..4525468 100644 --- a/ox/torrent/bencode.py +++ b/ox/torrent/bencode.py @@ -53,8 +53,8 @@ def decode_dict(x, f): lastkey = None while x[f] != 'e': k, f = decode_string(x, f) - #why is this needed - #if lastkey >= k: + # why is this needed + # if lastkey >= k: # raise ValueError lastkey = k r[k], f = decode_func[x[f]](x, f) @@ -81,9 +81,9 @@ def bdecode(x, sloppy = 1): r, l = decode_func[x[0]](x, 0) # except (IndexError, KeyError): except (IndexError, KeyError, ValueError): - raise ValueError, "bad bencoded data" + raise ValueError("bad bencoded data") if not sloppy and l != len(x): - raise ValueError, "bad bencoded data" + raise ValueError("bad bencoded data") return r def test_bdecode(): diff --git a/ox/web/auth.py b/ox/web/auth.py index e610959..f852d1f 100644 --- a/ox/web/auth.py +++ b/ox/web/auth.py @@ -17,7 +17,7 @@ def get(key): if key in auth: return auth[key] print("please add key %s to json file '%s'" % (key, user_auth)) - raise Exception,"no key %s found" % key + raise Exception("no key %s found" % key) def update(key, value): user_auth = os.environ.get('oxAUTH', os.path.expanduser('~/.ox/auth.json'))