March 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Clarify Tor Browser installation instructions.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 1a5f320570e6170cec721682f320a204a3454765 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:04:16 2015 +0000 Clarify Tor Browser installation instructions. * FIXES #15155: https://trac.torproject.org/projects/tor/ticket/15155 * THANKS TO qbi, nickm, and weasel for suggestions. --- lib/bridgedb/strings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index 1991b5f..a9a06bc 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -119,8 +119,9 @@ HOWTO_TBB = { 0: _("""How to start using your bridges"""), # TRANSLATORS: Please DO NOT translate "Tor Browser". 1: _("""\ -To enter bridges into Tor Browser, follow the instructions on the %s Tor -Browser download page %s to start Tor Browser."""), +To enter bridges into Tor Browser, first go to the %s Tor Browser download +page %s and then follow the instructions there for downloading and starting +Tor Browser."""), # TRANSLATORS: Please DO NOT translate "Tor". 2: _("""\ When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow

1 0

[bridgedb/master] Fix improper assignment to statefile @property in b.persistent.State.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 92df000d063ab9ea9229d66d3956cd78b5ed1ca8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 20:57:24 2015 +0000 Fix improper assignment to statefile @property in b.persistent.State. --- lib/bridgedb/persistent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index f728bdd..1c0d3df 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -100,7 +100,7 @@ class State(jelly.Jellyable): self.key = None if 'STATEFILE' in kwargs: - self.statefile(kwargs['STATEFILE']) + self.statefile = kwargs['STATEFILE'] for key, value in kwargs.items(): self.__dict__[key] = value

1 0

[bridgedb/master] Decrease logging for email signing.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 6557fd3bf7fd87a7c0e769747647b08666269d36 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 08:49:48 2015 +0000 Decrease logging for email signing. --- lib/bridgedb/email/autoresponder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index e96ad91..726856c 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -357,7 +357,6 @@ class EmailResponse(object): sig = self.gpgSign(body) if sig: body = sig - print("Signed email body:\n%s" % body) # XXX self.writelines(body)

1 0

[bridgedb/master] Refactor b.persistent.State with problems found in additional tests.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit cda620bc8a4fac397f07a3bc76fe25a5f8abbcf4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 21:04:09 2015 +0000 Refactor b.persistent.State with problems found in additional tests. * ADD documentation that `b.persistent.State.load` can raise a MissingState exception. * REMOVE an `else` clause in b.persistent.State.load() that was impossible to hit because the `elif` clause right before it should always succeed or raise an AttributeError. * ADD error handling for when pickle.load() is given an opened, but empty file, and an EOFError is raised. * CHANGE b.persistent.State.load() to only raise a MissingState exception at the end if there were errors detected during the function execution. * REMOVE unused `err` variable from b.persistent.State.save(). --- lib/bridgedb/persistent.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index 1c0d3df..ad4398d 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -158,6 +158,7 @@ class State(jelly.Jellyable): def load(self, statefile=None): """Load a previously saved statefile. + :raises MissingState: If there was any error loading the **statefile**. :rtype: :class:`State` or None :returns: The state, loaded from :attr:`State.STATEFILE`, or None if an error occurred. @@ -176,8 +177,6 @@ class State(jelly.Jellyable): fh = open(statefile, 'r') elif not statefile.closed: fh = statefile - else: - raise TypeError("Nothing worked.") except (IOError, OSError) as error: # pragma: no cover err += "There was an error reading statefile " err += "'{0}':\n{1}".format(statefile, error) @@ -186,14 +185,19 @@ class State(jelly.Jellyable): err += "\n\t{0}\nstatefile type = '{1}'".format( error.message, type(statefile)) else: - status = pickle.load(fh) - quo = jelly.unjelly(status) - if fh is not None: - fh.close() - if quo: - return quo + try: + status = pickle.load(fh) + except EOFError: + err += "The statefile %s was empty." % fh.name + else: + quo = jelly.unjelly(status) + if fh is not None: + fh.close() + if quo: + return quo - raise MissingState(err) + if err: + raise MissingState(err) def save(self, statefile=None): """Save state as a pickled jelly to a file on disk.""" @@ -204,8 +208,6 @@ class State(jelly.Jellyable): logging.debug("Saving state to: \t'%s'" % statefile) fh = None - err = '' - try: fh = open(statefile, 'w') except (IOError, OSError) as error: # pragma: no cover

1 0

[bridgedb/master] Add additional unittests for uncovered portions of bridgedb.persistent.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 09350c2af6c3248f5543740796f3e73d23b3f7aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 20:47:18 2015 +0000 Add additional unittests for uncovered portions of bridgedb.persistent. --- lib/bridgedb/persistent.py | 13 ++--- lib/bridgedb/test/test_persistentSaveAndLoad.py | 68 ++++++++++++++++++++++- 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index 8c65e78..f728bdd 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -17,7 +17,7 @@ import os.path try: import cPickle as pickle -except (ImportError, NameError): +except (ImportError, NameError): # pragma: no cover import pickle from twisted.python.reflect import safe_repr @@ -148,7 +148,7 @@ class State(jelly.Jellyable): fh.close() os.unlink(self._statefile) self._statefile = None - except (IOError, OSError) as error: + except (IOError, OSError) as error: # pragma: no cover logging.error("There was an error deleting the statefile: '%s'" % self._statefile) @@ -178,7 +178,7 @@ class State(jelly.Jellyable): fh = statefile else: raise TypeError("Nothing worked.") - except (IOError, OSError) as error: + except (IOError, OSError) as error: # pragma: no cover err += "There was an error reading statefile " err += "'{0}':\n{1}".format(statefile, error) except (AttributeError, TypeError) as error: @@ -208,10 +208,9 @@ class State(jelly.Jellyable): try: fh = open(statefile, 'w') - except MissingState as error: - err += error.message - except (IOError, OSError) as error: - err += "Error writing state file to '%s': %s" % (statefile, error) + except (IOError, OSError) as error: # pragma: no cover + logging.warn("Error writing state file to '%s': %s" + % (statefile, error)) else: try: pickle.dump(jelly.jelly(self), fh) diff --git a/lib/bridgedb/test/test_persistentSaveAndLoad.py b/lib/bridgedb/test/test_persistentSaveAndLoad.py index 7919df3..67585f6 100644 --- a/lib/bridgedb/test/test_persistentSaveAndLoad.py +++ b/lib/bridgedb/test/test_persistentSaveAndLoad.py @@ -67,6 +67,45 @@ class StateSaveAndLoadTests(unittest.TestCase): if savedStatefile: self.assertTrue(os.path.isfile(str(savedStatefile))) + def test_init_with_STATEFILE(self): + config = self.config + setattr(config, 'STATEFILE', '~/foo.state') + state = persistent.State(**config.__dict__) + self.loadedStateAssertions(state) + statefile = state.statefile + self.assertTrue(statefile.endswith('foo.state')) + + def test_init_without_config(self): + state = persistent.State(None) + self.loadedStateAssertions(state) + + def test_init_with_config(self): + state = persistent.State(self.config) + self.loadedStateAssertions(state) + + def test_get_statefile(self): + statefile = self.state._get_statefile() + self.assertIsInstance(statefile, basestring) + + def test_set_statefile(self): + self.state._set_statefile('~/bar.state') + statefile = self.state._get_statefile() + self.assertIsInstance(statefile, basestring) + + def test_set_statefile_new_dir(self): + config = self.config + setattr(config, 'STATEFILE', 'statefiles/foo.state') + state = persistent.State(**config.__dict__) + self.loadedStateAssertions(state) + statefile = state.statefile + self.assertTrue(statefile.endswith('foo.state')) + + def test_del_statefile(self): + self.state._set_statefile('baz.state') + self.state._del_statefile() + statefile = self.state._get_statefile() + self.assertIsNone(statefile) + def test_save(self): self.state.save() self.savedStateAssertions() @@ -93,5 +132,32 @@ class StateSaveAndLoadTests(unittest.TestCase): def test_load(self): self.state.save() - loadedState = persistent.load() + loadedState = persistent.load() + self.loadedStateAssertions(loadedState) + + def test_load_with_state(self): + loadedState = persistent.load(self.state) self.loadedStateAssertions(loadedState) + + def test_load_with_None(self): + persistent._setState(None) + self.assertRaises(persistent.MissingState, + persistent.load, None) + + def test_load_with_statefile(self): + self.assertRaises(persistent.MissingState, + self.state.load, 'quux.state') + + def test_load_with_statefile_opened(self): + fh = open('quux.state', 'w+') + self.assertRaises(persistent.MissingState, self.state.load, fh) + fh.close() + + def test_load_with_statefile_object(self): + self.assertRaises(persistent.MissingState, self.state.load, object) + + def test_load_without_statefile(self): + persistent._setState(None) + self.state.statefile = None + self.assertRaises(persistent.MissingState, + persistent.load)

1 0

[bridgedb/master] Avoid having a test for b.persistent.State write to $HOME.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 783a8f18e990608ebb915a0bcc4096b34646bc04 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 22:56:50 2015 +0000 Avoid having a test for b.persistent.State write to $HOME. --- lib/bridgedb/test/test_persistentSaveAndLoad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_persistentSaveAndLoad.py b/lib/bridgedb/test/test_persistentSaveAndLoad.py index 67585f6..6d6584d 100644 --- a/lib/bridgedb/test/test_persistentSaveAndLoad.py +++ b/lib/bridgedb/test/test_persistentSaveAndLoad.py @@ -88,7 +88,7 @@ class StateSaveAndLoadTests(unittest.TestCase): self.assertIsInstance(statefile, basestring) def test_set_statefile(self): - self.state._set_statefile('~/bar.state') + self.state._set_statefile('bar.state') statefile = self.state._get_statefile() self.assertIsInstance(statefile, basestring)

1 0

[bridgedb/master] Update gnupg==2.0.0 → gnupg==2.0.1 in requirements.txt.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 71a6ad2de1a07e3ced70dde9bdb6b44250010d9a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:07:27 2015 +0000 Update gnupg==2.0.0 → gnupg==2.0.1 in requirements.txt. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 27c531c..922b3d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pyOpenSSL==0.14 pygeoip==0.2.7 -gnupg==2.0.0 +gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 recaptcha-client==1.0.6

1 0

[bridgedb/master] Update gnupg==2.0.0 → gnupg==2.0.1 in .travis.requirements.txt.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit cda80b3484f60ed4eb08bc9c801c4ed63c98d0f3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:06:18 2015 +0000 Update gnupg==2.0.0 → gnupg==2.0.1 in .travis.requirements.txt. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index d2a94a8..28cfd78 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -24,7 +24,7 @@ Mako==0.8.1 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pygeoip==0.2.7 -gnupg==2.0.0 +gnupg==2.0.1 recaptcha-client==1.0.6 stem==1.2.2 zope.interface==3.6.1

1 0

[bridgedb/master] Condense code for getting statefile absolute path in b.persistent.State.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 7de653e942237f65743323e26bf018f4b696a591 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 24 22:58:33 2015 +0000 Condense code for getting statefile absolute path in b.persistent.State. These checks were unnecessary overhead, since the path expansion functions won't do anything if there's nothing to be done. --- lib/bridgedb/persistent.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index ad4398d..1b2507c 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -124,11 +124,7 @@ class State(jelly.Jellyable): :param string statefile: The filename of the statefile. """ - if filename.startswith('~'): - filename = os.path.expanduser(filename) - if not os.path.isabs(filename): - filename = os.path.abspath(filename) - + filename = os.path.abspath(os.path.expanduser(filename)) logging.debug("Setting statefile to '%s'" % filename) self._statefile = filename

1 0

[bridgedb/master] Add stem==1.3.0 to requirements.txt.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 9635ec7dfcbb4a8f3a95469af709172306cf0b74 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:09:55 2015 +0000 Add stem==1.3.0 to requirements.txt. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 922b3d9..6eeee59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 recaptcha-client==1.0.6 +stem==1.3.0 zope.interface==3.6.1

1 0