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

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

08 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/develop] Move bridgedb.Util → bridgedb.util.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit d8088ca7a6955dc0c528092faaf135817fa28dc2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:36:39 2014 +0000 Move bridgedb.Util → bridgedb.util. --- doc/sphinx/source/bridgedb.Util.rst | 6 +++--- doc/sphinx/source/bridgedb.rst | 3 ++- doc/sphinx/source/conf.py | 2 +- lib/bridgedb/Bridges.py | 10 +++++----- lib/bridgedb/Dist.py | 16 ++++++++-------- lib/bridgedb/EmailServer.py | 22 +++++++++++----------- lib/bridgedb/HTTPServer.py | 12 ++++++------ lib/bridgedb/Main.py | 4 ++-- lib/bridgedb/Util.py | 24 ------------------------ lib/bridgedb/util.py | 24 ++++++++++++++++++++++++ 10 files changed, 62 insertions(+), 61 deletions(-) diff --git a/doc/sphinx/source/bridgedb.Util.rst b/doc/sphinx/source/bridgedb.Util.rst index 70b8713..63db16d 100644 --- a/doc/sphinx/source/bridgedb.Util.rst +++ b/doc/sphinx/source/bridgedb.Util.rst @@ -1,9 +1,9 @@ -.. _Util: +.. _util: -bridgedb.Util +bridgedb.util ------------- -.. automodule:: bridgedb.Util +.. automodule:: bridgedb.util :members: :undoc-members: :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 38dc9a2..40e0151 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -21,5 +21,6 @@ bridgedb bridgedb.Stability bridgedb.Storage bridgedb.Tests - bridgedb.Util + bridgedb.txrecaptcha + bridgedb.util gen_bridge_descriptors diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index de44db4..4caac64 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -43,7 +43,7 @@ import bridgedb.Stability import bridgedb.Storage import bridgedb.test import bridgedb.Tests -import bridgedb.Util +import bridgedb.util import gen_bridge_descriptors diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 5c406f6..a60ff85 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -22,8 +22,8 @@ import random import bridgedb.Storage import bridgedb.Bucket -import bridgedb.Util as Util +from bridgedb import util from bridgedb.crypto import getHMACFunc from bridgedb.parse import addr from bridgedb.parse import networkstatus @@ -1035,7 +1035,7 @@ class BridgeRing(BridgeHolder): else: logging.debug( "Got duplicate bridge %r in main hashring for position %r." - % (Util.logSafely(k.encode('hex')), pos.encode('hex'))) + % (util.logSafely(k.encode('hex')), pos.encode('hex'))) keys = keys[:N] keys.sort() @@ -1280,12 +1280,12 @@ class FilteredBridgeSplitter(BridgeHolder): if not bridge.running: logging.warn( "Skipping hashring insertion for non-running bridge: '%s'" - % Util.logSafely(bridge.fingerprint)) + % util.logSafely(bridge.fingerprint)) return index = 0 logging.debug("Inserting %s into splitter" - % (Util.logSafely(bridge.fingerprint))) + % (util.logSafely(bridge.fingerprint))) for old_bridge in self.bridges[:]: if bridge.fingerprint == old_bridge.fingerprint: self.bridges[index] = bridge @@ -1297,7 +1297,7 @@ class FilteredBridgeSplitter(BridgeHolder): if filterFn(bridge): subring.insert(bridge) logging.debug("Inserted bridge '%s' into '%s' sub hashring" - % (Util.logSafely(bridge.fingerprint), ringname)) + % (util.logSafely(bridge.fingerprint), ringname)) def extractFilterNames(self, ringname): """Get the names of the filters applied to a particular sub hashring. diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 7107867..e7bc443 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -14,7 +14,7 @@ import bridgedb.Bridges import bridgedb.Storage -import bridgedb.Util as Util +import bridgedb.util as util import logging import re @@ -235,7 +235,7 @@ class IPBasedDistributor(Distributor): for an example of how this is used. """ logging.info("Attempting to return %d bridges to client %s..." - % (N, Util.logSafely(ip))) + % (N, util.logSafely(ip))) if not bridgeFilterRules: bridgeFilterRules=[] @@ -251,7 +251,7 @@ class IPBasedDistributor(Distributor): area = self.areaMapper(ip) logging.debug("IP mapped to area:\t%s" - % Util.logSafely("{0}.0/24".format(area))) + % util.logSafely("{0}.0/24".format(area))) key1 = '' pos = 0 @@ -267,7 +267,7 @@ class IPBasedDistributor(Distributor): len(self.categories), n) bridgeFilterRules.append(g) - logging.info("category<%s>%s", epoch, Util.logSafely(area)) + logging.info("category<%s>%s", epoch, util.logSafely(area)) pos = self.areaOrderHmac("category<%s>%s" % (epoch, area)) key1 = getHMAC(self.splitter.key, "Order-Bridges-In-Ring-%d" % n) @@ -485,19 +485,19 @@ class EmailBasedDistributor(Distributor): lastSaw = db.getEmailTime(emailaddress) logging.info("Attempting to return for %d bridges for %s..." - % (N, Util.logSafely(emailaddress))) + % (N, util.logSafely(emailaddress))) if lastSaw is not None and lastSaw + MAX_EMAIL_RATE >= now: logging.info("Client %s sent duplicate request within %d seconds." - % (Util.logSafely(emailaddress), MAX_EMAIL_RATE)) + % (util.logSafely(emailaddress), MAX_EMAIL_RATE)) if wasWarned: logging.info( "Client was already warned about duplicate requests.") raise IgnoreEmail("Client was warned", - Util.logSafely(emailaddress)) + util.logSafely(emailaddress)) else: logging.info("Sending duplicate request warning to %s..." - % Util.logSafely(emailaddress)) + % util.logSafely(emailaddress)) db.setWarnedEmail(emailaddress, True, now) db.commit() diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 90b22af..0242103 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -29,7 +29,7 @@ from twisted.internet.error import ConnectionRefusedError from zope.interface import implements import bridgedb.Dist -import bridgedb.Util as Util +import bridgedb.util as util from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport @@ -104,11 +104,11 @@ def getMailResponse(lines, ctx): logging.info("Ignoring bad address on incoming email.") return None,None if not addrdomain: - logging.info("Couldn't parse domain from %r", Util.logSafely(clientAddr)) + logging.info("Couldn't parse domain from %r", util.logSafely(clientAddr)) if addrdomain and ctx.cfg.EMAIL_DOMAIN_MAP: addrdomain = ctx.cfg.EMAIL_DOMAIN_MAP.get(addrdomain, addrdomain) if addrdomain not in ctx.cfg.EMAIL_DOMAINS: - logging.info("Unrecognized email domain %r", Util.logSafely(addrdomain)) + logging.info("Unrecognized email domain %r", util.logSafely(addrdomain)) return None,None rules = ctx.cfg.EMAIL_DOMAIN_RULES.get(addrdomain, []) if 'dkim' in rules: @@ -181,7 +181,7 @@ def getMailResponse(lines, ctx): # Handle rate limited email except TooSoonEmail, e: logging.info("Got a mail too frequently; warning %r: %s.", - Util.logSafely(clientAddr), e) + util.logSafely(clientAddr), e) # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours @@ -191,12 +191,12 @@ def getMailResponse(lines, ctx): except IgnoreEmail, e: logging.info("Got a mail too frequently; ignoring %r: %s.", - Util.logSafely(clientAddr), e) + util.logSafely(clientAddr), e) return None, None except BadEmail, e: logging.info("Got a mail from a bad email address %r: %s.", - Util.logSafely(clientAddr), e) + util.logSafely(clientAddr), e) return None, None if bridges: @@ -269,18 +269,18 @@ def replyToMail(lines, ctx): if response is None: logging.debug("getMailResponse() said not to reply to %s, so I won't." - % Util.logSafely(sendToUser)) + % util.logSafely(sendToUser)) return response.seek(0) - logging.info("Sending reply to %r", Util.logSafely(sendToUser)) + logging.info("Sending reply to %r", util.logSafely(sendToUser)) d = Deferred() factory = twisted.mail.smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, response, d, retries=0, timeout=30) d.addErrback(_ebReplyToMailFailure) - logging.info("Sending reply to %r", Util.logSafely(sendToUser)) + logging.info("Sending reply to %r", util.logSafely(sendToUser)) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) return d @@ -461,11 +461,11 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, # Only log the email text (including all headers) if SAFE_LOGGING is # disabled: - if not Util.safe_logging: + if not util.safe_logging: mail.seek(0) logging.debug("Email contents:\n%s" % mail.read()) else: - logging.debug("Email text for %r created." % Util.logSafely(clientAddr)) + logging.debug("Email text for %r created." % util.logSafely(clientAddr)) mail.seek(0) return clientAddr, mail diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 3809f2d..c0e5b66 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -24,11 +24,11 @@ from twisted.web.util import redirectTo import bridgedb.Dist import bridgedb.I18n as I18n -import bridgedb.Util as Util from bridgedb import captcha from bridgedb import crypto from bridgedb import txrecaptcha +from bridgedb import util from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByTransport @@ -287,7 +287,7 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): valid = captcha.GimpCaptcha.check(challenge, solution, self.secretKey, clientHMACKey) logging.debug("%sorrect captcha from %r: %r." % ( - "C" if valid else "Inc", Util.logSafely(clientIP), solution)) + "C" if valid else "Inc", util.logSafely(clientIP), solution)) return valid @@ -463,7 +463,7 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): remoteIP = self.getRemoteIP() logging.debug("Captcha from %r. Parameters: %r" - % (Util.logSafely(clientIP), request.args)) + % (util.logSafely(clientIP), request.args)) def checkResponse(solution, request): """Check the :class:`txrecaptcha.RecaptchaResponse`. @@ -479,11 +479,11 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): # breaking). Hence, the 'no cover' pragma. if solution.is_valid: # pragma: no cover logging.info("Valid CAPTCHA solution from %r." - % Util.logSafely(clientIP)) + % util.logSafely(clientIP)) return (True, request) else: logging.info("Invalid CAPTCHA solution from %r: %r" - % (Util.logSafely(clientIP), solution.error_code)) + % (util.logSafely(clientIP), solution.error_code)) return (False, request) d = txrecaptcha.submit(challenge, response, self.recaptchaPrivKey, @@ -669,7 +669,7 @@ class WebResourceBridges(resource.Resource): unblocked = False logging.info("Replying to web request from %s. Parameters were %r" - % (Util.logSafely(ip), request.args)) + % (util.logSafely(ip), request.args)) rules = [] bridgeLines = None diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d21239c..c2c69c9 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -26,7 +26,7 @@ import bridgedb.Bridges as Bridges import bridgedb.Dist as Dist import bridgedb.Time as Time import bridgedb.Storage -import bridgedb.Util as Util +from bridgedb import util def configureLogging(cfg): @@ -41,7 +41,7 @@ def configureLogging(cfg): logfile = getattr(cfg, 'LOGFILE', "") logfile_count = getattr(cfg, 'LOGFILE_COUNT', 5) logfile_rotate_size = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) - Util.set_safe_logging(safelogging) + util.set_safe_logging(safelogging) logging.getLogger().setLevel(level) if logfile: diff --git a/lib/bridgedb/Util.py b/lib/bridgedb/Util.py deleted file mode 100644 index de512d5..0000000 --- a/lib/bridgedb/Util.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_Util -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: 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 - -"""Common utilities for BridgeDB.""" - -safe_logging = True - -def set_safe_logging(safe): - global safe_logging - safe_logging = safe - -def logSafely(val): - if safe_logging: - return "[scrubbed]" - else: - return val diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py new file mode 100644 index 0000000..723ed8e --- /dev/null +++ b/lib/bridgedb/util.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_util -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: 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 + +"""Common utilities for BridgeDB.""" + +safe_logging = True + +def set_safe_logging(safe): + global safe_logging + safe_logging = safe + +def logSafely(val): + if safe_logging: + return "[scrubbed]" + else: + return val

1 0

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

08 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/develop] Update bridgedb.runner.generateDescriptors to mention leekspin.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit a2f59909bdde9f5c31f1282ad028184eb3fe0a72 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:41:40 2014 +0000 Update bridgedb.runner.generateDescriptors to mention leekspin. --- lib/bridgedb/runner.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/runner.py b/lib/bridgedb/runner.py index d067bd9..4b4564f 100644 --- a/lib/bridgedb/runner.py +++ b/lib/bridgedb/runner.py @@ -22,15 +22,16 @@ import sys def generateDescriptors(count=None, rundir=None): """Run a script which creates fake bridge descriptors for testing purposes. - This will run ``scripts/gen_bridge_descriptors`` to create bridge server - descriptors, bridge extra-info descriptors, and networkstatus document. - - ** NOTE: ** - This function can take a very long time to run, especially in headless - environments where entropy sources are minimal, because it creates the - keys for each mocked OR, which are embedded in the server descriptors, - used to calculate the OR fingerprints, and sign the descriptors, among - other things. + This will run Leekspin_ to create bridge server descriptors, bridge + extra-info descriptors, and networkstatus document. + + .. warning: This function can take a very long time to run, especially in + headless environments where entropy sources are minimal, because it + creates the keys for each mocked OR, which are embedded in the server + descriptors, used to calculate the OR fingerprints, and sign the + descriptors, among other things. + + .. _Leekspin: https://gitweb.torproject.org/user/isis/leekspin.git :param integer count: Number of mocked bridges to generate descriptor for. (default: 3)

1 0

[bridgedb/develop] Add sphinx build source for bridgedb.txrecaptcha module.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 2f97b58b24d584d6b14f98941d2ebd6f6287c19d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:43:39 2014 +0000 Add sphinx build source for bridgedb.txrecaptcha module. --- doc/sphinx/source/bridgedb.txrecaptcha.rst | 9 +++++++++ doc/sphinx/source/conf.py | 1 + 2 files changed, 10 insertions(+) diff --git a/doc/sphinx/source/bridgedb.txrecaptcha.rst b/doc/sphinx/source/bridgedb.txrecaptcha.rst new file mode 100644 index 0000000..afb6d1c --- /dev/null +++ b/doc/sphinx/source/bridgedb.txrecaptcha.rst @@ -0,0 +1,9 @@ +.. _txrecaptcha: + +bridgedb.txrecaptcha +-------------------- + +.. automodule:: bridgedb.txrecaptcha + :members: + :undoc-members: + :show-inheritance: diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 1fdfddd..2f05ca7 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -43,6 +43,7 @@ import bridgedb.Stability import bridgedb.Storage import bridgedb.test import bridgedb.Tests +import bridgedb.txrecaptcha import bridgedb.util

1 0

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

08 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/develop] Remove overzealous logging of config updates in bridgedb.Main.
by isis＠torproject.org 08 Apr '14

08 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/develop] Remove another pprint from a logging call in bridgedb.Main.
by isis＠torproject.org 08 Apr '14

08 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/develop] Add linked header in sphinx source for bridgedb.captcha.
by isis＠torproject.org 08 Apr '14

08 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/develop] Change PTTBB link to TBB-3.6-beta-1 download page.
by isis＠torproject.org 08 Apr '14

08 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