April 2014 - tor-commits - lists.torproject.org

[oonib/master] fix doctest (python -m doctest __init__.py was failing)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 9c14a5dd6651b4237d541b564d567474348fb9a2 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:19:44 2014 -0700 fix doctest (python -m doctest __init__.py was failing) --- oonib/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index ee1946b..ac17bef 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -25,7 +25,6 @@ class Storage(dict): 2 >>> del o.a >>> o.a - None """ def __getattr__(self, key): return self.get(key)

1 0

[oonib/master] remove overbroad try/except
by art＠torproject.org 23 Apr '14

23 Apr '14

commit eae427c12a5c1ca1ec42c9c10893710eb9ed9d08 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:21:02 2014 -0700 remove overbroad try/except --- oonib/report/handlers.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 9e9e8ca..f1fec4a 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -250,10 +250,7 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): software_version = str(report_data['software_version']) probe_asn = str(report_data['probe_asn']) - try: - probe_cc = str(report_data['probe_cc']) - except: - probe_cc = 'ZZ' + probe_cc = str(report_data.get('probe_cc', 'ZZ')) self.testName = str(report_data['test_name']) self.testVersion = str(report_data['test_version'])

1 0

[oonib/master] move write() out of the scope of an IOError catch clause not meant for it
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 92379c18388b9438a5affec452f0855fef087a32 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:00:10 2014 -0700 move write() out of the scope of an IOError catch clause not meant for it --- oonib/deck/handlers.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oonib/deck/handlers.py b/oonib/deck/handlers.py index 44ff24f..8f30bfd 100644 --- a/oonib/deck/handlers.py +++ b/oonib/deck/handlers.py @@ -21,16 +21,15 @@ class DeckDescHandler(OONIBHandler): deckDesc = yaml.safe_load(f) for k in ['name', 'description', 'version', 'author', 'date']: response[k] = deckDesc[k] - self.write(response) - except IOError: log.err("Deck %s missing" % deckID) raise e.MissingDeck - except KeyError: log.err("Deck %s missing required keys!" % deckID) raise e.MissingDeckKeys + self.write(response) + class DeckListHandler(OONIBHandler): def get(self): if not config.main.deck_dir:

1 0

[oonib/master] remove unused (and confusing) global
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 1c1e3d73086e47ef17031a55909853f8f0812516 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:30:54 2014 -0700 remove unused (and confusing) global --- oonib/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/oonib/config.py b/oonib/config.py index afe3091..1388e6b 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -46,6 +46,5 @@ class Config(object): check_path(self.main.deck_dir, e.InvalidDeckDirectory) backend_version = __version__ -reports = {} config = Config()

1 0

[oonib/master] remove duplicate import
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 529fe95115154860365a5d15c89275c6038dc82b Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 11:46:32 2014 -0700 remove duplicate import --- oonib/options.py | 1 - 1 file changed, 1 deletion(-) diff --git a/oonib/options.py b/oonib/options.py index 7acdc23..d5c87b3 100644 --- a/oonib/options.py +++ b/oonib/options.py @@ -1,6 +1,5 @@ from twisted.python import usage from twisted.python.runtime import platformType -from twisted.python import usage if platformType == "win32": from twisted.scripts._twistw import ServerOptions

1 0

[oonib/master] tighter try/except/with blocks
by art＠torproject.org 23 Apr '14

23 Apr '14

commit bb924d9f178bc6ee32233b36680fd69e59ea9a26 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:06:12 2014 -0700 tighter try/except/with blocks --- oonib/deck/handlers.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/oonib/deck/handlers.py b/oonib/deck/handlers.py index 8f30bfd..b9589b0 100644 --- a/oonib/deck/handlers.py +++ b/oonib/deck/handlers.py @@ -16,18 +16,20 @@ class DeckDescHandler(OONIBHandler): # against matching a certain pattern in the handler. bn = os.path.basename(deckID + '.desc') try: - with open(os.path.join(config.main.deck_dir, bn)) as f: - response = {} - deckDesc = yaml.safe_load(f) - for k in ['name', 'description', 'version', 'author', 'date']: - response[k] = deckDesc[k] + f = open(os.path.join(config.main.deck_dir, bn)) except IOError: log.err("Deck %s missing" % deckID) raise e.MissingDeck - except KeyError: - log.err("Deck %s missing required keys!" % deckID) - raise e.MissingDeckKeys + with f: + deckDesc = yaml.safe_load(f) + response = {} + for k in ['name', 'description', 'version', 'author', 'date']: + try: + response[k] = deckDesc[k] + except KeyError: + log.err("Deck %s missing required keys!" % deckID) + raise e.MissingDeckKeys self.write(response) class DeckListHandler(OONIBHandler):

1 0

[oonib/master] Fix bug introduce in previous PR.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit bf6da812764aa3879fef67aedd6e072bad193e24 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 21 19:23:59 2014 +0200 Fix bug introduce in previous PR. --- oonib/bouncer/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 0980262..0a5b51f 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -97,7 +97,7 @@ class Bouncer(object): break # Or default to a random selection else: - c = random.choice(choices) + c = random.choice(choices.keys()) response[helper_name] = {'collector': c, 'address': choices[c]}

1 0

[oonib/master] a more-direct test
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 38048f623f84d6bc8edfbb7c68ec4669b2450a76 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 11:55:38 2014 -0700 a more-direct test --- oonib/bouncer/handlers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 2c7a1fe..0980262 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -123,9 +123,7 @@ class BouncerQueryHandler(OONIBHandler): except KeyError: raise e.TestHelpersKeyMissing - try: - assert isinstance(requested_helpers, list) - except AssertionError: + if not isinstance(requested_helpers, list): raise e.InvalidRequest response = self.bouncer.filterHelperAddresses(requested_helpers)

1 0

[oonib/master] tighter try/except/with blocks
by art＠torproject.org 23 Apr '14

23 Apr '14

commit fe398cdf47ab94d9199f286fc1b161b1ebee912c Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:13:34 2014 -0700 tighter try/except/with blocks --- oonib/input/handlers.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/oonib/input/handlers.py b/oonib/input/handlers.py index fce7451..33bec55 100644 --- a/oonib/input/handlers.py +++ b/oonib/input/handlers.py @@ -11,23 +11,27 @@ class InputDescHandler(OONIBHandler): def get(self, inputID): bn = os.path.basename(inputID) + ".desc" try: - with open(os.path.join(config.main.input_dir, bn)) as f: - response = {} - inputDesc = yaml.safe_load(f) - for k in ['name', 'description', 'version', 'author', 'date']: - response[k] = inputDesc[k] - response['id'] = inputID - self.write(response) + f = open(os.path.join(config.main.input_dir, bn)) except IOError: log.err("No Input Descriptor found for id %s" % inputID) self.set_status(404) self.write({'error': 'missing-input'}) + return + with f: + inputDesc = yaml.safe_load(f) - except Exception, e: - log.exception(e) - log.err("Invalid Input Descriptor found for id %s" % inputID) - self.set_status(500) - self.write({'error': 'invalid-input-descriptor'}) + response = {'id': inputID} + for k in ['name', 'description', 'version', 'author', 'date']: + try: + response[k] = inputDesc[k] + except Exception, e: # XXX this should probably be KeyError + log.exception(e) + log.err("Invalid Input Descriptor found for id %s" % inputID) + self.set_status(500) + self.write({'error': 'invalid-input-descriptor'}) + return + + self.write(response) class InputListHandler(OONIBHandler): def get(self):

1 0

[oonib/master] Fix InvalidArchiveDirectory exception message
by art＠torproject.org 23 Apr '14

23 Apr '14

commit a1c3023b94da46c044a9470ba8aa2dba9b0c562c Author: Taylor Hornby <havoc(a)defuse.ca> Date: Thu Mar 27 11:14:10 2014 -0600 Fix InvalidArchiveDirectory exception message --- oonib/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/config.py b/oonib/config.py index 4f818b0..956fcc1 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -42,7 +42,7 @@ class Config(object): if not self.main.report_dir or not os.path.isdir(self.main.report_dir): raise e.InvalidReportDirectory(self.main.report_dir) if not self.main.archive_dir or not os.path.isdir(self.main.archive_dir): - raise e.InvalidArchiveDirectory(self.main.report_dir) + raise e.InvalidArchiveDirectory(self.main.archive_dir) if self.main.input_dir and not os.path.isdir(self.main.input_dir): raise e.InvalidInputDirectory(self.main.input_dir)

1 0