tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[oonib/master] Fix typo in parsing of nettests.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 2fd5df09bd739c773eb58d2919c07e3dd24807d5 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:36:47 2014 +0100 Fix typo in parsing of nettests. Thanks to @Darius for spotting it. --- oonib/policy/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 913aeb1..83a7f24 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -34,7 +34,7 @@ class Policy(object): def validateNettest(self, nettest_name): # XXX add support for version checking too. valid = False - if self.nettest: + if not self.nettest: valid = True for nt in self.nettest: if nettest_name == nt['name']:

1 0

[oonib/master] More-direct code for validateNettest, as long as I'm messing with it. You could do the same to validateInputHash.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit fcd5b892f03431bc79978321320453423931cbf6 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:36:00 2014 -0700 More-direct code for validateNettest, as long as I'm messing with it. You could do the same to validateInputHash. --- oonib/policy/handlers.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 83a7f24..ac12c00 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -33,15 +33,9 @@ class Policy(object): def validateNettest(self, nettest_name): # XXX add support for version checking too. - valid = False - if not self.nettest: - valid = True - for nt in self.nettest: - if nettest_name == nt['name']: - valid = True - break - if not valid: - raise e.InvalidNettestName + if self.nettest: + if not any(nt['name'] == nettest_name for nt in self.nettest): + raise e.InvalidNettestName class PolicyHandler(OONIBHandler): def initialize(self):

1 0

[oonib/master] Most of the body of this doesn't need to be in the scope of the 'with'. (This comes up in lots of the other 'with's in this codebase.)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 8ade100d5df1730c6d953c5f1916cb79234d8fd4 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:37:31 2014 -0700 Most of the body of this doesn't need to be in the scope of the 'with'. (This comes up in lots of the other 'with's in this codebase.) --- oonib/policy/handlers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index ac12c00..7f753b0 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -14,11 +14,11 @@ class Policy(object): def __init__(self): with open(config.main.policy_file) as f: p = yaml.safe_load(f) - self.input = self.nettest = [] - if 'nettest' in p.keys(): - self.nettest = list(p['nettest']) - if 'input' in p.keys(): - self.input = list(p['input']) + self.input = self.nettest = [] + if 'nettest' in p.keys(): + self.nettest = list(p['nettest']) + if 'input' in p.keys(): + self.input = list(p['input']) def validateInputHash(self, input_hash): valid = False

1 0

[oonib/master] Avoid the possibility of accidentally sharing the same mutable list for self.input and self.nettest.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit ec09d0763e820165e2b9630a4c2eb6ece80f717f Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:40:08 2014 -0700 Avoid the possibility of accidentally sharing the same mutable list for self.input and self.nettest. --- oonib/policy/handlers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 7f753b0..b0c1aa5 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -14,7 +14,8 @@ class Policy(object): def __init__(self): with open(config.main.policy_file) as f: p = yaml.safe_load(f) - self.input = self.nettest = [] + self.input = [] + self.nettest = [] if 'nettest' in p.keys(): self.nettest = list(p['nettest']) if 'input' in p.keys():

1 0

[oonib/master] simpler methods in Storage
by art＠torproject.org 23 Apr '14

23 Apr '14

commit e8304df436d1a0ca84f6c50a015acb65b0470b93 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:14:51 2014 -0700 simpler methods in Storage --- oonib/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index be102df..ee1946b 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -28,10 +28,7 @@ class Storage(dict): None """ def __getattr__(self, key): - try: - return self[key] - except KeyError, k: - return None + return self.get(key) def __setattr__(self, key, value): self[key] = value @@ -49,8 +46,7 @@ class Storage(dict): return dict(self) def __setstate__(self, value): - for (k, v) in value.items(): - self[k] = v + self.update(value.items()) def randomStr(length, num=True): """

1 0

[oonib/master] simpler Config.load()
by art＠torproject.org 23 Apr '14

23 Apr '14

commit abfaed208212af9c65de0fed6ab1ea5b344e4823 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:24:56 2014 -0700 simpler Config.load() --- oonib/config.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index 6fea660..afe3091 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -23,19 +23,17 @@ class Config(object): raise e.ConfigFileNotSpecified try: - with open(self.opts['config']) as f: + with open(config_file) as f: configuration = yaml.safe_load(f) except IOError: - raise e.ConfigFileDoesNotExist(self.opts['config']) + raise e.ConfigFileDoesNotExist(config_file) + + self.main = Storage(configuration['main'].items()) - self.main = Storage() - for k, v in configuration['main'].items(): - self.main[k] = v self.helpers = Storage() for name, helper in configuration['helpers'].items(): - self.helpers[name] = Storage() - for k, v in helper.items(): - self.helpers[name][k] = v + self.helpers[name] = Storage(helper.items()) + self.check_paths() def check_paths(self):

1 0

[oonib/master] If p is a dictionary (as I assume) then you don't need the .keys().
by art＠torproject.org 23 Apr '14

23 Apr '14

commit f4a18e0d4f0ebeab05ca340de92e258cd1b6e562 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:41:11 2014 -0700 If p is a dictionary (as I assume) then you don't need the .keys(). --- oonib/policy/handlers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index b0c1aa5..cbf1c08 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -16,9 +16,9 @@ class Policy(object): p = yaml.safe_load(f) self.input = [] self.nettest = [] - if 'nettest' in p.keys(): + if 'nettest' in p: self.nettest = list(p['nettest']) - if 'input' in p.keys(): + if 'input' in p: self.input = list(p['input']) def validateInputHash(self, input_hash):

1 0

[oonib/master] clearer check_paths()
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 16dab41d88997b1132a444007d69eee696623b01 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:11:03 2014 -0700 clearer check_paths() --- oonib/config.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index 956fcc1..6fea660 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -39,15 +39,13 @@ class Config(object): self.check_paths() def check_paths(self): - 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.archive_dir) - - if self.main.input_dir and not os.path.isdir(self.main.input_dir): - raise e.InvalidInputDirectory(self.main.input_dir) - if self.main.deck_dir and not os.path.isdir(self.main.deck_dir): - raise e.InvalidDeckDirectory(self.main.deck_dir) + def check_path(directory, complaint): + if not (directory and os.path.isdir(directory)): + raise complaint(directory) + check_path(self.main.report_dir, e.InvalidReportDirectory) + check_path(self.main.archive_dir, e.InvalidArchiveDirectory) + check_path(self.main.input_dir, e.InvalidInputDirectory) + check_path(self.main.deck_dir, e.InvalidDeckDirectory) backend_version = __version__ reports = {}

1 0

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

23 Apr '14

commit 5581e1c07cecf1f9aa32c5dac17e8a8e69a5bae2 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] Fix InvalidArchiveDirectory exception message
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 773dbe5b492f2f6e6636e483f2f3965d3f7dc7cd 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014