tor-commits June 2015

tor-commits@lists.torproject.org

22 participants
1870 discussions

[bridgedb/develop] Add function to HTML-encode strings
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit faf4898324faaedf4ff675230e5275c264ab90b1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 30 05:17:42 2015 -0700 Add function to HTML-encode strings --- lib/bridgedb/util.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index f3d87bd..8034120 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -180,6 +180,26 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, memo[key] = distance return distance +htmlify_string_map = { + '<': '<', + '>': '>', + '&': '&', + '"': '"', + "'": ''', + '\n': '<br/>' + } +def htmlify_string(s): + """Encode HTML special characters, and newlines, in s. + + >>> htmlify_string('<script>alert("badthink");</script>') + '<script>alert("badthink");</script>' + >>> htmlify_string('bridge 1\nbridge 2') + 'bridge 1<br/>bridge 2' + + :param str s: The string to encode. + """ + return ''.join(map((lambda ch: htmlify_string_map.get(ch, ch)), s)) + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0

[bridgedb/develop] Replace a for loop with a list comprehension
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 4e3aa2db2d00e7b4abded7038a091f1762483302 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:43:22 2015 -0700 Replace a for loop with a list comprehension --- lib/bridgedb/test/legacy_Tests.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index bf4cf39..ddf30f3 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -80,9 +80,7 @@ def randomPortSpec(): """ returns a random list of ports """ - ports = [] - for i in range(0,24): - ports.append(random.randint(1,65535)) + ports = [randomPort() for i in range(0,24)] ports.sort(reverse=True) portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)])

1 0

[bridgedb/develop] Remove clear abuses of str.strip() and str.rstrip()
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 4e773f346f2b442a1726af94b7b2da231b73c1d6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:24:33 2015 -0700 Remove clear abuses of str.strip() and str.rstrip() --- lib/bridgedb/Bridges.py | 3 ++- lib/bridgedb/bridges.py | 6 ++++-- lib/bridgedb/test/test_Main.py | 3 ++- lib/bridgedb/test/test_Tests.py | 3 ++- lib/bridgedb/test/test_bridgedb.py | 3 ++- lib/bridgedb/test/test_captcha.py | 7 ++++--- lib/bridgedb/test/test_configure.py | 3 ++- lib/bridgedb/test/test_crypto.py | 3 ++- lib/bridgedb/test/test_email_autoresponder.py | 3 ++- lib/bridgedb/test/test_https.py | 3 ++- lib/bridgedb/test/test_smtp.py | 3 ++- lib/bridgedb/util.py | 9 +++++++++ 12 files changed, 35 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bdb911a..8c05083 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -29,6 +29,7 @@ from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.safelog import logSafely +from bridgedb.util import remove_prefix try: from cStringIO import StringIO @@ -692,7 +693,7 @@ class FilteredBridgeSplitter(BridgeHolder): subringName = [self.distributorName] for filterName in filterNames: if filterName != 'filterAssignBridgesToRing': - subringName.append(filterName.strip('filterBridgesBy')) + subringName.append(remove_prefix(filterName, 'filterBridgesBy')) subringName = '-'.join([x for x in subringName]) subring.setName(subringName) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 96f995e..8759473 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -38,6 +38,8 @@ from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.nickname import isValidRouterNickname +from bridgedb.util import remove_prefix +from bridgedb.util import remove_suffix class PluggableTransportUnavailable(Exception): @@ -1462,8 +1464,8 @@ class Bridge(BridgeBackwardsCompatibility): sequence = asn1.DerSequence() key = self.signingKey - key = key.strip(TOR_SIGNING_KEY_HEADER) - key = key.strip(TOR_SIGNING_KEY_FOOTER) + key = remove_prefix(key, TOR_SIGNING_KEY_HEADER) + key = remove_suffix(key, TOR_SIGNING_KEY_FOOTER) key = key.replace('\n', '') key = base64.b64decode(key) diff --git a/lib/bridgedb/test/test_Main.py b/lib/bridgedb/test/test_Main.py index 0b14319..688c383 100644 --- a/lib/bridgedb/test/test_Main.py +++ b/lib/bridgedb/test/test_Main.py @@ -29,13 +29,14 @@ from twisted.trial import unittest from bridgedb import Main from bridgedb.Bridges import BridgeHolder from bridgedb.parse.options import parseOptions +from bridgedb.util import remove_suffix logging.getLogger().disabled = True HERE = os.getcwd() -TOPDIR = HERE.rstrip('_trial_temp') +TOPDIR = remove_suffix(HERE, '_trial_temp') CI_RUNDIR = os.path.join(TOPDIR, 'run') # A networkstatus descriptor with two invalid ORAddress (127.0.0.1 and ::1) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index e78a4c4..a46c50f 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -29,6 +29,7 @@ from twisted.trial import unittest from bridgedb.test import legacy_Tests as Tests from bridgedb.test import deprecated +from bridgedb.util import remove_suffix warnings.filterwarnings('ignore', module="bridgedb\.test\.legacy_Tests") @@ -191,7 +192,7 @@ class DynamicTestCaseMeta(type): origFunc = origName.split('.')[-2:] origName = '_'.join(origFunc) if origName.endswith('_py'): # this happens with doctests - origName = origName.strip('_py') + origName = remove_suffix(origName, '_py') methName = str(methodPrefix + origName).replace('.', '_') meth = testMethodFactory(test, methName) logging.debug("Set %s.%s=%r" % (cls.__name__, methName, meth)) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 70c71f0..301309a 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -23,6 +23,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix class BridgeDBCliTest(unittest.TestCase): @@ -30,7 +31,7 @@ class BridgeDBCliTest(unittest.TestCase): def setUp(self): here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index a5083d7..ea05749 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -23,6 +23,7 @@ from zope.interface import providedBy from bridgedb import captcha from bridgedb import crypto +from bridgedb.util import remove_suffix class CaptchaTests(unittest.TestCase): @@ -97,7 +98,7 @@ class GimpCaptchaTests(unittest.TestCase): def setUp(self): here = os.getcwd() - self.topDir = here.rstrip('_trial_temp') + self.topDir = remove_suffix(here, '_trial_temp') self.cacheDir = os.path.join(self.topDir, 'captchas') self.badCacheDir = os.path.join(here, 'capt') @@ -131,7 +132,7 @@ class GimpCaptchaTests(unittest.TestCase): """GimpCaptcha with bad cacheDir should raise GimpCaptchaError.""" self.assertRaises(captcha.GimpCaptchaError, captcha.GimpCaptcha, self.publik, self.sekrit, self.hmacKey, - self.cacheDir.rstrip('chas')) + remove_suffix(self.cacheDir, 'chas')) def test_init(self): """Test that __init__ correctly initialised all the values.""" @@ -238,7 +239,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - challengeBadB64 = challenge.rstrip('==') + "\x42\x42\x42" + challengeBadB64 = remove_suffix(challenge, '==') + "\x42\x42\x42" self.assertEquals( c.check(challenge, c.answer, c.secretKey, c.hmacKey), True) diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py index 501ed1f..5246613 100644 --- a/lib/bridgedb/test/test_configure.py +++ b/lib/bridgedb/test/test_configure.py @@ -16,6 +16,7 @@ import os from twisted.trial import unittest from bridgedb import configure +from bridgedb.util import remove_suffix class ConfigureTests(unittest.TestCase): @@ -24,7 +25,7 @@ class ConfigureTests(unittest.TestCase): def setUp(self): """Find the config file in the top directory of this repo.""" here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.configFilename = os.path.join(topdir, 'bridgedb.conf') def test_loadConfig_with_file(self): diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index c2010ca..afd63c8 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -33,6 +33,7 @@ from bridgedb import txrecaptcha from bridgedb.persistent import Conf from bridgedb.test.util import fileCheckDecorator from bridgedb.test.email_helpers import _createConfig +from bridgedb.util import remove_suffix logging.disable(50) @@ -98,7 +99,7 @@ class InitializeGnuPGTests(unittest.TestCase): :returns: The full path to the new gnupg home directory. """ here = os.getcwd() - topDir = here.rstrip('_trial_temp') + topDir = remove_suffix(here, '_trial_temp') gnupghome = os.path.join(topDir, '.gnupg') gnupghomeNew = os.path.join(here, '.gnupg') diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 2895802..4c36be4 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -29,6 +29,7 @@ from bridgedb.Dist import TooSoonEmail from bridgedb.test.email_helpers import _createConfig from bridgedb.test.email_helpers import _createMailServerContext from bridgedb.test.email_helpers import DummyEmailDistributorWithState +from bridgedb.util import remove_suffix class CreateResponseBodyTests(unittest.TestCase): @@ -36,7 +37,7 @@ class CreateResponseBodyTests(unittest.TestCase): def _moveGPGTestKeyfile(self): here = os.getcwd() - topDir = here.rstrip('_trial_temp') + topDir = remove_suffix(here, '_trial_temp') self.gpgFile = os.path.join(topDir, '.gnupg', 'TESTING.subkeys.sec') self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') shutil.copy(self.gpgFile, self.gpgMoved) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 92b07bf..bf229f8 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -36,6 +36,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' @@ -44,7 +45,7 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 1cbafba..b4cf8f9 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -17,6 +17,7 @@ from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists from bridgedb.test.util import getBridgeDBPID +from bridgedb.util import remove_suffix # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange @@ -118,7 +119,7 @@ class SMTPTests(unittest.TestCase): running. ''' here = os.getcwd() - topdir = here.rstrip('_trial_temp') + topdir = remove_suffix(here, '_trial_temp') self.rundir = os.path.join(topdir, 'run') self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') self.pid = getBridgeDBPID(self.pidfile) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index ca2a88f..3e1b42f 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -302,3 +302,12 @@ class mixin: expect mixin classes to end in ``'mixin'``. """ __metaclass__ = abc.ABCMeta + +def remove_prefix(s, f): + assert s.startswith(f) + return s[len(f):] + +def remove_suffix(s, f): + assert s.endswith(f) + return s[:-len(f)] +

1 0

[bridgedb/develop] Avoid joining, then stripping the delimiter out
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 0ba9dda5a67257c1de1d34837b928b99d8e476df Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Mar 23 11:41:54 2015 -0700 Avoid joining, then stripping the delimiter out --- lib/bridgedb/parse/addr.py | 8 ++------ lib/bridgedb/test/legacy_Tests.py | 5 +---- lib/bridgedb/test/test_parse_addr.py | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index af63192..96dc21e 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -429,7 +429,7 @@ def isValidIP(ip): reasons.append('cannot convert to ip') if reasons: - explain = ', '.join([r for r in reasons]).strip(', ') + explain = ', '.join([r for r in reasons]) logging.debug("IP address %r is invalid! Reason(s): %s" % (ip, explain)) return False @@ -568,11 +568,7 @@ class PortList(object): def __str__(self): """Returns a pretty string representation of this PortList.""" - ret = [] - for port in self.ports: - ret.append(',%s' % port) - ret = ''.join([piece for piece in ret]) - return ret.lstrip(",") + return ','.join(['%s' % port for port in self.ports]) def __repr__(self): """Returns a raw depiction of this PortList.""" diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index d416d22..bf4cf39 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -85,10 +85,7 @@ def randomPortSpec(): ports.append(random.randint(1,65535)) ports.sort(reverse=True) - portspec = "" - for i in range(0,16): - portspec += "%d," % random.choice(ports) - portspec = portspec.rstrip(',') #remove trailing , + portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)]) return portspec def randomCountry(): diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index 55f0f60..4659efb 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -671,7 +671,7 @@ class PortListTest(unittest.TestCase): tooMany = addr.PortList.PORTSPEC_LEN + 1 ports = [self.getRandomPort() for x in xrange(tooMany)] log.msg("Testing addr.PortList(%s))" - % ', '.join([type('')(port) for port in ports]).strip(', ')) + % ', '.join([type('')(port) for port in ports])) portList = addr.PortList(*ports) self.assertEqual(len(portList), tooMany)

1 0

[bridgedb/develop] Correct a comment
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit d84d88462aae54349bf0df6a1a62080893395ed2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 28 16:57:41 2015 -0700 Correct a comment (Malice is an intent; if something is unintentional, then it's not malicious.) --- lib/bridgedb/parse/descriptors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 3f8d48e..9d196b8 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -172,7 +172,7 @@ def deduplicate(descriptors, statistics=False): .. note:: If two descriptors for the same router are discovered, AND both descriptors have the **same** published timestamp, then the router's fingerprint WILL BE LOGGED ON PURPOSE, because we assume that router - to be malicious (deliberately, or unintentionally). + to be broken or malicious. :param list descriptors: A list of :api:`stem.descriptor.server_descriptor.RelayDescriptor`s,

1 0

[bridgedb/develop] Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit bd5866b65fa670b41e96672325e8540e32286012 Merge: be58b8f 4e3aa2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:21:17 2015 +0000 Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop lib/bridgedb/Bridges.py | 3 ++- lib/bridgedb/bridges.py | 6 ++++-- lib/bridgedb/parse/addr.py | 8 ++------ lib/bridgedb/test/legacy_Tests.py | 9 ++------- lib/bridgedb/test/test_Main.py | 3 ++- lib/bridgedb/test/test_Tests.py | 3 ++- lib/bridgedb/test/test_bridgedb.py | 3 ++- lib/bridgedb/test/test_captcha.py | 7 ++++--- lib/bridgedb/test/test_configure.py | 3 ++- lib/bridgedb/test/test_crypto.py | 3 ++- lib/bridgedb/test/test_email_autoresponder.py | 3 ++- lib/bridgedb/test/test_https.py | 3 ++- lib/bridgedb/test/test_parse_addr.py | 2 +- lib/bridgedb/test/test_smtp.py | 3 ++- lib/bridgedb/util.py | 9 +++++++++ 15 files changed, 40 insertions(+), 28 deletions(-)

1 0

[bridgedb/develop] Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit be58b8f8a70b3e1e4f3cd6d3e10b6fe2a82a7998 Merge: e6e7ea1 d84d884 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 6 20:03:28 2015 +0000 Merge remote-tracking branch 'rr/2015-04-30-01-misc-fixes' into develop lib/bridgedb/bridges.py | 2 +- lib/bridgedb/parse/descriptors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Fix comment typo
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit 14ebe12b221700644a0e492207bfa184305fdc3c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Mar 28 16:56:37 2015 -0700 Fix comment typo --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 93b9fe9..e2b2ff5 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -321,7 +321,7 @@ class PluggableTransport(BridgeAddressBase): """ argDict = {} - # PT argumentss are comma-separated in the extrainfo + # PT arguments are comma-separated in the extrainfo # descriptors. While there *shouldn't* be anything after them that was # separated by a space (and hence would wind up being in a different # item in `arguments`), if there was we'll join it to the rest of the

1 0

[bridgedb/develop] Forbid non-ASCII and control chars, double quotes and backslashes in PT args
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit ad7b5f9ab3354aef3d69db33933ab1fcebf16bd1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 30 08:41:08 2015 -0700 Forbid non-ASCII and control chars, double quotes and backslashes in PT args --- lib/bridgedb/bridges.py | 19 +++++++++++++++++++ lib/bridgedb/util.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index e2b2ff5..b799ca3 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -38,6 +38,7 @@ from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.nickname import isValidRouterNickname +from bridgedb.util import isascii_noncontrol class PluggableTransportUnavailable(Exception): @@ -351,6 +352,10 @@ class PluggableTransport(BridgeAddressBase): 2. The :data:`arguments` is a dictionary. + 3. The :data:`arguments` do not contain non-ASCII or control + characters or double quotes or backslashes, in keys or + in values. + :raises MalformedPluggableTransport: if any of the above checks fails. """ if not self.fingerprint: @@ -372,6 +377,20 @@ class PluggableTransport(BridgeAddressBase): ("Cannot create PluggableTransport with arguments type: %s") % type(self.arguments)) + for k, v in self.arguments.items(): + kv = ''.join((k, v)) + if not isascii_noncontrol(kv): + raise MalformedPluggableTransport( + ("Cannot create PluggableTransport with non-ASCII or " + "control characters in arguments: %r=%r") + % (k, v)) + if '"' in kv or '\\' in kv: + raise MalformedPluggableTransport( + ("Cannot create PluggableTransport with double quotes or " + "backslashes in arguments: %r=%r") + % (k, v)) + pass + if not self._checkArguments(): raise MalformedPluggableTransport( ("Can't use %s transport with missing arguments. Arguments: " diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 8034120..580f31f 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -200,6 +200,41 @@ def htmlify_string(s): """ return ''.join(map((lambda ch: htmlify_string_map.get(ch, ch)), s)) +def isascii(s): + """Return True if there are no non-ASCII characters in s, False otherwise. + + Note that this function differs from the str.is* methods in that + it returns True for the empty string, rather than False. + + >>> isascii('\x80') + False + >>> isascii('foo\tbar\rbaz\n') + True + >>> isascii('foo bar') + True + + :param str s: The string to check for non-ASCII characters. + """ + return all(map((lambda ch: ord(ch) < 128), s)) + +def isascii_noncontrol(s): + """Return True if there are no non-ASCII or control characters in + s, False otherwise. + + Note that this function differs from the str.is* methods in that + it returns True for the empty string, rather than False. + + >>> isascii_noncontrol('\x80') + False + >>> isascii_noncontrol('foo\tbar\rbaz\n') + False + >>> isascii_noncontrol('foo bar') + True + + :param str s: The string to check for non-ASCII or control characters. + """ + return all(map((lambda ch: 32 <= ord(ch) < 127), s)) + class JustifiedLogFormatter(logging.Formatter): """A logging formatter which pretty prints thread and calling function

1 0

[bridgedb/develop] Documentation; import bridgedb.parse modules into Sphinx conf.py.
by isis＠torproject.org 04 Jun '15

04 Jun '15

commit e6e7ea12af85f94813d95603043c02294da8eaf0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 3 01:00:11 2015 +0000 Documentation; import bridgedb.parse modules into Sphinx conf.py. --- doc/sphinx/source/conf.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 2f01b4c..5cd485f 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -44,6 +44,14 @@ import bridgedb.Filters import bridgedb.geo import bridgedb.HTTPServer import bridgedb.Main +import bridgedb.parse +import bridgedb.parse.addr +import bridgedb.parse.descriptors +import bridgedb.parse.fingerprint +import bridgedb.parse.headers +import bridgedb.parse.nickname +import bridgedb.parse.options +import bridgedb.parse.versions import bridgedb.persistent import bridgedb.proxy import bridgedb.qrcodes

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2015