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

[bridgedb/master] Fix formatting of file headers and module docstring for bridgedb.Dist.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 9a2f3bcde37a5ee7dee22f1455ceff27978c4ced Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:21:03 2014 +0000 Fix formatting of file headers and module docstring for bridgedb.Dist. --- lib/bridgedb/Dist.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 3bfb2d8..7107867 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -1,10 +1,16 @@ -# BridgeDB by Nick Mathewson. -# Copyright (c) 2007-2009, The Tor Project, Inc. -# See LICENSE for licensing information - -""" -This module has functions to decide which bridges to hand out to whom. -""" +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_Dist -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Nick Mathewson +# Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> +# :copyright: (c) 2013-2014, Isis Lovecruft +# (c) 2013-2014, Matthew Finkel +# (c) 2007-2014, The Tor Project, Inc. +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""This module has functions to decide which bridges to hand out to whom.""" import bridgedb.Bridges import bridgedb.Storage

1 0

[bridgedb/master] Remove old gen_bridge_descriptors docs from sphinx build configs.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit f96b6c4a3dfc04748f9959fedd274ecb3aabc6cc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:38:04 2014 +0000 Remove old gen_bridge_descriptors docs from sphinx build configs. --- doc/sphinx/source/bridgedb.rst | 1 - doc/sphinx/source/conf.py | 1 - doc/sphinx/source/gen_bridge_descriptors.rst | 7 ------- 3 files changed, 9 deletions(-) diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 40e0151..86e5abf 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -23,4 +23,3 @@ bridgedb bridgedb.Tests bridgedb.txrecaptcha bridgedb.util - gen_bridge_descriptors diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 4caac64..1fdfddd 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -44,7 +44,6 @@ import bridgedb.Storage import bridgedb.test import bridgedb.Tests import bridgedb.util -import gen_bridge_descriptors class Mock(object): diff --git a/doc/sphinx/source/gen_bridge_descriptors.rst b/doc/sphinx/source/gen_bridge_descriptors.rst deleted file mode 100644 index 604075f..0000000 --- a/doc/sphinx/source/gen_bridge_descriptors.rst +++ /dev/null @@ -1,7 +0,0 @@ -gen_bridge_descriptors ----------------------- - -.. automodule:: gen_bridge_descriptors - :members: - :undoc-members: - :show-inheritance:

1 0

[bridgedb/master] PEP8 whitespace fix for one inline comment in bridgedb.Main.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 0639cd71f792be9c119e52ae622707d388bea83b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:55:57 2014 +0000 PEP8 whitespace fix for one inline comment in bridgedb.Main. --- lib/bridgedb/Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index c2c69c9..6411f62 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -261,7 +261,7 @@ def loadConfig(configFile=None, configCls=None): if configCls: itsSafeToUseLogging = True oldConfig = configCls.__dict__ - configuration.update(**oldConfig) # Load current settings + configuration.update(**oldConfig) # Load current settings logging.info("Reloading over in-memory configurations...") if (len(configuration) > 0) and itsSafeToUseLogging:

1 0

[bridgedb/master] Remove another pprint from a logging call in bridgedb.Main.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 6c836322fe8edc9711194dc8b5d51c8e8e8f6194 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:57:12 2014 +0000 Remove another pprint from a logging call in bridgedb.Main. --- lib/bridgedb/Main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index dc45eab..84e2252 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -275,8 +275,9 @@ def loadConfig(configFile=None, configCls=None): exec compiled in configuration if itsSafeToUseLogging: - logging.debug("New configuration settings:\n%s" - % pprint(configuration, depth=4)) + logging.debug("New configuration settings:") + logging.debug("\n".join(["{0} = {1}".format(key, value) + for key, value in configuration.items()])) # Create a :class:`Conf` from the settings stored within the local scope # of the ``configuration`` dictionary:

1 0

[bridgedb/master] Remove overzealous logging of config updates in bridgedb.Main.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit c047582df068617a2d813d3716992e6f69e763f6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:56:36 2014 +0000 Remove overzealous logging of config updates in bridgedb.Main. --- lib/bridgedb/Main.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 6411f62..dc45eab 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -264,11 +264,6 @@ def loadConfig(configFile=None, configCls=None): configuration.update(**oldConfig) # Load current settings logging.info("Reloading over in-memory configurations...") - if (len(configuration) > 0) and itsSafeToUseLogging: - logging.debug("Old configuration settings:") - logging.debug("\n".join(["{key} = {value}".format(key, value) - for key, value in configuration])) - conffile = configFile if (configFile is None) and ('CONFIG_FILE' in configuration): conffile = configuration['CONFIG_FILE']

1 0

[bridgedb/master] Add linked header in sphinx source for bridgedb.captcha.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 747ba6330e060acf9112177ba07fc2017bd46595 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 19:27:57 2014 +0000 Add linked header in sphinx source for bridgedb.captcha. --- doc/sphinx/source/bridgedb.captcha.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/sphinx/source/bridgedb.captcha.rst b/doc/sphinx/source/bridgedb.captcha.rst index 633fa61..59adce6 100644 --- a/doc/sphinx/source/bridgedb.captcha.rst +++ b/doc/sphinx/source/bridgedb.captcha.rst @@ -1,3 +1,5 @@ +.. _captcha: + bridgedb.captcha ----------------

1 0

[bridgedb/master] Change PTTBB link to TBB-3.6-beta-1 download page.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 8e0d3a955c4130c7e3d6c44b1f053a4e2ffd51de Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 6 20:34:31 2014 +0000 Change PTTBB link to TBB-3.6-beta-1 download page. * CHANGE link text to call it "Tor Browser Bundle", due to PTTBB and TBB being unified into the same bundle. --- lib/bridgedb/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 4245337..3819744 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -8,8 +8,8 @@ <span class="step-title"> ${_("Step 1")}</span> <span style="margin-left: 20px;"> - ${_("Get the %s Pluggable Transports Tor Browser Bundle %s") % \ - ("""<a href="https://www.torproject.org/projects/obfsproxy.html.en#download">""", "</a>")}</span> + ${_("Get the %s Tor Browser Bundle %s") % \ + ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta">""", "</a>")}</span> </span></div> </div>

1 0

[bridgedb/master] PEP8 cleanup import lines in EmailServer.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit d49fe1dcaddbaf67b98ad9b5b3e19fb68379ccf4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 6 22:28:15 2014 +0000 PEP8 cleanup import lines in EmailServer. --- lib/bridgedb/EmailServer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 915f82b..8e007de 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -16,7 +16,8 @@ import re import rfc822 import time -from ipaddr import IPv4Address, IPv6Address +from ipaddr import IPv4Address +from ipaddr import IPv6Address from twisted.internet import reactor from twisted.internet.defer import Deferred @@ -26,14 +27,15 @@ from twisted.internet.error import ConnectionRefusedError from zope.interface import implements -import bridgedb.Dist import bridgedb.util as util from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail -from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 +from bridgedb import Dist +from bridgedb import I18n +from bridgedb.Filters import filterBridgesByIP6 +from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn -import bridgedb.I18n as I18n class MailFile: """A file-like object used to hand rfc822.Message a list of lines

1 0

[bridgedb/master] PEP8 for EmailServer module docstring.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit d2a7b9376309db490091f6c7b1869acb8b7f3586 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 6 20:39:50 2014 +0000 PEP8 for EmailServer module docstring. --- lib/bridgedb/EmailServer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 0242103..915f82b 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -3,9 +3,7 @@ # Copyright (c) 2007-2013, The Tor Project, Inc. # See LICENSE for licensing information -""" -This module implements the email interface to the bridge database. -""" +"""This module implements the email interface to the bridge database.""" from __future__ import unicode_literals

1 0

[bridgedb/master] Import `defer` rather than `Deferred` in EmailServer.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 85d34853512c9b8a2227e5026c9a60aa537260ef Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 00:08:56 2014 +0000 Import `defer` rather than `Deferred` in EmailServer. --- lib/bridgedb/EmailServer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 84b6804..92a93bb 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -19,8 +19,8 @@ import time from ipaddr import IPv4Address from ipaddr import IPv6Address +from twisted.internet import defer from twisted.internet import reactor -from twisted.internet.defer import Deferred from twisted.internet.task import LoopingCall import twisted.mail.smtp from twisted.internet.error import ConnectionRefusedError @@ -281,7 +281,7 @@ def replyToMail(lines, ctx): response.seek(0) logging.info("Sending reply to %r", util.logSafely(sendToUser)) - d = Deferred() + d = defer.Deferred() factory = twisted.mail.smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, response, d, retries=0, timeout=30) @@ -369,7 +369,7 @@ class MailMessage: """Called when we receive the end of a message.""" if not self.ignoring: replyToMail(self.lines, self.ctx) - return twisted.internet.defer.succeed(None) + return defer.succeed(None) def connectionLost(self): """Called if we die partway through reading a message."""

1 0