tor-commits February 2014

tor-commits@lists.torproject.org

23 participants
1529 discussions

[bridgedb/master] Merge branch 'release-0.1.1'
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 3ee91c1f50e2ec0206f19fc1a161b4596bc1fd04 Merge: 380820f 00228a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 4 00:27:19 2014 +0000 Merge branch 'release-0.1.1' CHANGELOG | 69 +++ README | 19 +- bridgedb.conf | 139 ++++-- doc/DESCRIPTORS.md | 3 +- .../XXX-bridgedb-database-improvements.txt | 260 ++++++++++ doc/proposals/XXX-bridgedb-social-distribution.txt | 496 ++++++++++++++++++++ lib/bridgedb/Bridges.py | 4 +- lib/bridgedb/HTTPServer.py | 179 +++++-- lib/bridgedb/Main.py | 21 +- lib/bridgedb/Storage.py | 10 +- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 34 +- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 45 +- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 47 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 41 +- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 46 +- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 49 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 44 +- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 43 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 42 +- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 33 +- lib/bridgedb/persistent.py | 2 +- lib/bridgedb/templates/assets/custom.css | 2 +- lib/bridgedb/templates/base.html | 32 ++ setup.py | 10 +- 41 files changed, 1593 insertions(+), 838 deletions(-)

1 0

[bridgedb/master] Merge remote-tracking branch 'tpo-sysrqb/develop' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit f2ecd0d49951b4efbf69969d1d9c0403ca04e929 Merge: a619387 bf3027a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 1 23:52:42 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/develop' into develop Conflicts: bridgedb.conf README | 19 ++++++++------- bridgedb.conf | 74 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 42 deletions(-) diff --cc bridgedb.conf index bcde0cf,534a4fe..9bf414a --- a/bridgedb.conf +++ b/bridgedb.conf @@@ -131,11 -121,21 +126,34 @@@ SAFELOGGING = Tru LOGFILE_COUNT = 5 LOGFILE_ROTATE_SIZE = 10000000 - # Only consider routers whose purpose matches this string. - BRIDGE_PURPOSE = "bridge" ++#--------------------------- ++# Database/Parsing Options \ ++#------------------------------------------------------------------------------ ++# ++# These options change various database transaction and descriptor parsing ++# behaviours. ++#------------------------------------------------------------------------------ + - # File to which we dump bridge pool assignments for statistics. - ASSIGNMENTS_FILE = "assignments.log" ++# (boolean) If True, then collect, sort, and store all timestamps seen for all ++# bridges. This operation is extremely expensive, and should be disabled when ++# it is not necessary. ++COLLECT_TIMESTAMPS = True ++ + #------------------------------- + # General Distribution Options \ + #------------------------------------------------------------------------------ + # + # These options are not specific to a certain distributor and they may alter + # the bridge selection process in certain circumstances. + #------------------------------------------------------------------------------ + + # Filename that contains blocked bridges list. Comment out to disable. + #COUNTRY_BLOCK_FILE = "blocked-bridges" + + # A list of filenames that contain IP addresses (one per line) of proxies. + # All IP-based distributors that see an incoming connection from a proxy + # will treat them specially. + PROXY_LIST_FILES = [] # How many clusters do we group IPs in when distributing bridges based on IP? # Note that if PROXY_LIST_FILES is set (below), what we actually do here @@@ -207,6 -197,18 +215,14 @@@ HTTP_UNENCRYPTED_PORT = Non # unencrypted connections. HTTP_USE_IP_FROM_FORWARDED_HEADER = False -# How many bridges do we try to give back in an answer by the -# unencrypted HTTP distributor? -HTTP_N_BRIDGES_PER_ANSWER = 3 - + # Options related to recaptcha support. + # Enable/Disable recaptcha + RECAPTCHA_ENABLED = False + + # Recaptcha API keys + RECAPTCHA_PUB_KEY = '' + RECAPTCHA_PRIV_KEY = '' + #------------------------------- # Email Distribution Options \ #------------------------------------------------------------------------------

1 0

[bridgedb/master] Change hashlib.new() → hashlib.sha1() in bridgedb.Storage.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 124db8690726a1867df9f1f9fee601b7479fc6cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 3 23:02:32 2014 +0000 Change hashlib.new() → hashlib.sha1() in bridgedb.Storage. --- lib/bridgedb/Storage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index edcc566..fdeea23 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -262,7 +262,7 @@ class Database: cur.execute("DELETE FROM EmailedBridges WHERE when_mailed < ?", (t,)) def getEmailTime(self, addr): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur cur.execute("SELECT when_mailed FROM EmailedBridges WHERE " "email = ?", (addr,)) @@ -272,7 +272,7 @@ class Database: return strToTime(v[0]) def setEmailTime(self, addr, whenMailed): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur t = timeToStr(whenMailed) cur.execute("INSERT OR REPLACE INTO EmailedBridges " @@ -359,7 +359,7 @@ class Database: return True def getWarnedEmail(self, addr): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() cur = self._cur cur.execute("SELECT * FROM WarnedEmails WHERE " " email = ?", (addr,)) @@ -369,7 +369,7 @@ class Database: return True def setWarnedEmail(self, addr, warned=True, whenWarned=time.time()): - addr = hashlib.new(addr).hexdigest() + addr = hashlib.sha1(addr).hexdigest() t = timeToStr(whenWarned) cur = self._cur if warned == True:

1 0

[bridgedb/master] Add example extrainfo `transport` line for scramblesuit.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 58884217ad83a4c5711e6e2c54aaa846af890e4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 14 20:13:56 2014 +0000 Add example extrainfo `transport` line for scramblesuit. Philipp Winter's scramblesuit paper has a section on creating easily handwritable shared secrets. [0] To my memory, this excludes using the character `O` (capital o) and the integer `1`, because they are easily confused for the integer '0' and the character 'l', respectively. However, Philipp mentioned on IRC that scramblesuit `password=` fields in the `transport` line are actually just the set of base32 characters. [1] * ADD a line to doc/DESCRIPTORS.md which shows an example scramblesuit-enabled bridge which uses a shared secret passed through BridgeDB. See #9013. [0]: http://arxiv.org/abs/1305.3199 [1]: https://tools.ietf.org/html/rfc4648 --- doc/DESCRIPTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/DESCRIPTORS.md b/doc/DESCRIPTORS.md index 8a456b7..226f368 100644 --- a/doc/DESCRIPTORS.md +++ b/doc/DESCRIPTORS.md @@ -170,6 +170,7 @@ obproxy pluggable transport types: dirreq-v3-tunneled-dl complete=12,timeout=0,running=0 transport obfs3 10.0.1.111:3333 transport obfs2 10.0.1.111:2222 + transport scramblesuit 10.0.1.111:4444 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567 bridge-stats-end 2013-10-21 13:04:24 (86400 s) bridge-ips ca=8 bridge-ip-versions v4=8,v6=0

1 0

[bridgedb/master] Fix a typo in doc/DESCRIPTORS.md.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit ee1b3360f88f72e689f78bed8e63c141c8374050 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 14 19:56:20 2014 +0000 Fix a typo in doc/DESCRIPTORS.md. --- doc/DESCRIPTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTORS.md b/doc/DESCRIPTORS.md index 087d4e0..8a456b7 100644 --- a/doc/DESCRIPTORS.md +++ b/doc/DESCRIPTORS.md @@ -130,7 +130,7 @@ Optionally followed by: bridge-stats-end 2013-10-21 17:28:15 (86400 s) bridge-ips de=8,nl=8,us=8 -And, if it include the `bridge-ips` line, it MAY include the following right +And, if it includes the `bridge-ips` line, it MAY include the following right afterwards: bridge-ip-versions v4=16,v6=8

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit fe285af43012ecb3f963949ee5d3e19d4737701b Merge: 38af253 380820f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 12 05:37:20 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Comment out print()s and sys.stdout.write()s in setup.py.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit bdc23b29901f78356ec5e2d65206ae61b9f89893 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jan 19 19:04:38 2014 +0000 Comment out print()s and sys.stdout.write()s in setup.py. --- setup.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 4359fed..5ec2d79 100644 --- a/setup.py +++ b/setup.py @@ -163,7 +163,7 @@ def get_supported_langs(): for line in langsfile.readlines(): if line.startswith('supported'): line = "supported = %s\n" % supported - print("REWROTE supported langs: %s" % line) + #print("REWROTE supported langs: %s" % line) new_langs_lines.append(line) with open(repo_langs, 'w') as newlangsfile: for line in new_langs_lines: @@ -226,7 +226,7 @@ def get_data_files(filesonly=False): for ldir, lfile in zip(lang_dirs, lang_files): data_files.append((ldir, [lfile,])) - [sys.stdout.write("Added data_file '%s'\n" % x) for x in data_files] + #[sys.stdout.write("Added data_file '%s'\n" % x) for x in data_files] return data_files @@ -257,12 +257,8 @@ class runTests(setuptools.Command): sys.path = old_path -requires, deplinks = get_requirements() -print('Found requirements:') -[print('\t%s' % name) for name in requires] -print('Found dependency links:') -[print('\t%s' % uri) for uri in deplinks] +requires, deplinks = get_requirements() setuptools.setup( name='bridgedb',

1 0

[bridgedb/master] Sync bridgedb.conf with bridgedb-admin.git (no settings changed).
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 6068a5ec52c8b3177f7ad47d2dcb8f1454893e83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 17 16:41:20 2014 +0000 Sync bridgedb.conf with bridgedb-admin.git (no settings changed). --- bridgedb.conf | 85 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 29 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index a0a1f57..bf97077 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -8,12 +8,34 @@ # pretend you're writing Python, and everything will be peachy keen. #______________________________________________________________________________ # -# This file is part of BridgeDB, a Tor bridge distribution system. +# Part of BridgeDB, a Tor bridge distribution system. # -# :copyright: (c) 2007-2013, The Tor Project, Inc. +# :authors: The Tor Project, Inc. +# :license: This file is freely distributed as part of BridgeDB, see LICENSE +# for details. +# :copyright: (c) 2007-2013 The Tor Project, Inc. # (c) 2007-2013, all sentient entities within the AUTHORS file -# :license: see LICENSE for licensing information -#______________________________________________________________________________ +# :version: 0.0.3 +#=============================================================================== +# +# CHANGELOG: +# ~~~~~~~~~~ +# Changes in version 0.0.3 - 2014-01-17 +# * UPDATE config from bridgedb.git/bridgedb.conf, without changing any of the +# settings. +# +# Changes in version 0.0.2 - 2014-01-17 +# * ADD missing settings, EMAIL_GPG_SIGNING_ENABLED and EMAIL_GPG_SIGNING_KEY. +# +# Changes in version 0.0.1 - 2013-08-30 +# * ADD version of config file in use on ponticum. +# - Two config variables, RECAPTCHA_PUB_KEY and RECAPTCHA_PRIV_KEY, have +# been removed, they can be found in: +# patches/001-bridgedb-conf-recaptcha-vars.patch. +# * CLEANUP the config file slightly (such as adding these headers) and +# fixing the linewraps. No other variables were touched. +# +#=============================================================================== #===========================# # General-purpose options # @@ -33,6 +55,10 @@ # can read it. #------------------------------------------------------------------------------ +# We chdir to this directory when we start; all files with relative pathnames +# are created under this directory +#RUN_IN_DIR = "/srv/bridges.torproject.org/run" + # List of filenames from which we read ``@type bridge-server-descriptor``s, on # startup and on SIGHUP. BRIDGE_FILES = ["bridge-descriptors"] @@ -62,9 +88,6 @@ HTTPS_KEY_FILE="privkey.pem" # Either a file to log to, or None if we should log to the console. LOGFILE = "bridgedb.log" -# File to which we dump bridge pool assignments for statistics. -ASSIGNMENTS_FILE = "assignments.log" - # File in which to write our pid PIDFILE = "bridgedb.pid" @@ -93,7 +116,7 @@ PROXY_LIST_FILES = [] # Be sure to also see the LOGFILE option above! #------------------------------------------------------------------------------ -# One of "DEBUG", "INFO", "WARNING", "ERROR"... +# One of "DEBUG", "INFO", "WARNING", "ERROR", or "FATAL: LOGLEVEL = "DEBUG" # If true, we scrub all potentially identifying information before we log it @@ -103,10 +126,12 @@ SAFELOGGING = True LOGFILE_COUNT = 5 LOGFILE_ROTATE_SIZE = 10000000 - # Only consider routers whose purpose matches this string. BRIDGE_PURPOSE = "bridge" +# File to which we dump bridge pool assignments for statistics. +ASSIGNMENTS_FILE = "assignments.log" + # How many clusters do we group IPs in when distributing bridges based on IP? # Note that if PROXY_LIST_FILES is set (below), what we actually do here # is use one higher than the number here, and the extra cluster is used @@ -118,7 +143,7 @@ N_IP_CLUSTERS = 4 FORCE_PORTS = [(443, 1)] # If possible, always give a certain number of answers with a given flag. -# Only "stable" is now supported. This is a list of (flag,minimum) tuples. +# Only "Stable" is now supported. This is a list of (flag,minimum) tuples. FORCE_FLAGS = [("Stable", 1)] #------------------------------- @@ -131,7 +156,7 @@ FORCE_FLAGS = [("Stable", 1)] # your SSL certificate and key! #------------------------------------------------------------------------------ -# Set to ``True`` to enable distribution via HTTP or HTTPS; False otherwise. +# (boolean) True to enable distribution via HTTP or HTTPS; False otherwise. HTTPS_DIST = True # (string or None) The IP address where we listen for HTTPS connections. If @@ -141,7 +166,7 @@ HTTPS_BIND_IP = '127.0.0.1' # (integer or None) The port to listen on for incoming HTTPS connections. HTTPS_PORT = 6789 -# How many bridges do we give back in an answer? +# How many bridges do we give back in an answer (either HTTP or HTTPS)? HTTPS_N_BRIDGES_PER_ANSWER = 3 # Should we tell http users about the bridge fingerprints? Turn this on @@ -160,14 +185,10 @@ HTTP_UNENCRYPTED_BIND_IP = None # (integer or None) The port to listen on for incoming HTTP connections. HTTP_UNENCRYPTED_PORT = None -# Same as the ``HTTPS_USE_IP_FROM_FORWARDED_HEADER`` option, but for +# (boolean) Same as the HTTPS_USE_IP_FROM_FORWARDED_HEADER option, but for # unencrypted connections. HTTP_USE_IP_FROM_FORWARDED_HEADER = False -# The number of bridges to hand out per response by the unencrypted HTTP -# distributor -HTTP_N_BRIDGES_PER_ANSWER = 3 - #------------------------------- # Email Distribution Options \ #------------------------------------------------------------------------------ @@ -181,11 +202,14 @@ HTTP_N_BRIDGES_PER_ANSWER = 3 # True if we are enabling distribution via Email; false otherwise. EMAIL_DIST = True -# What email addresses do we use for outgoing email? EMAIL_FROM_ADDR goes -# in the From: line in outgoing headers, and EMAIL_SMTP_FROM_ADDR goes in -# the MAIL FROM header in outgoing SMTP. +# What email addresses do we use for outgoing email? + +# EMAIL_FROM_ADDR goes in the 'From:' header on outgoing emails: EMAIL_FROM_ADDR = "bridges(a)torproject.org" + +# EMAIL_SMTP_FROM_ADDR goes in the 'Mail-From:' header in outgoing SMTP: EMAIL_SMTP_FROM_ADDR = "bridges(a)torproject.org" + EMAIL_SMTP_HOST = "127.0.0.1" EMAIL_SMTP_PORT = 25 @@ -196,8 +220,8 @@ EMAIL_USERNAME = "bridges" EMAIL_DOMAINS = ["gmail.com", "yahoo.com"] # Map from unofficial domain to canonical domain. -EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", - "googlemail.com" : "gmail.com"} +EMAIL_DOMAIN_MAP = {"mail.google.com": "gmail.com", + "googlemail.com": "gmail.com"} # Map from canonical domain to list of options for that domain. Recognized # options are: @@ -206,19 +230,19 @@ EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com", # with the value "pass", then drop the message. # # Note that unrecognized options are ignored; be sure to spell them right! -EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"], - 'yahoo.com' : ["dkim"]} +EMAIL_DOMAIN_RULES = {'gmail.com': ["ignore_dots", "dkim"], + 'yahoo.com': ["dkim"]} # If there are any IPs in this list, only allow incoming connections from # those IPs. EMAIL_RESTRICT_IPS = [] # IP and port to listen on for email connections. Debugging only. -EMAIL_BIND_IP="127.0.0.1" -EMAIL_PORT=6725 +EMAIL_BIND_IP = "127.0.0.1" +EMAIL_PORT = 6725 # How many bridges do we give back in an answer? -EMAIL_N_BRIDGES_PER_ANSWER=3 +EMAIL_N_BRIDGES_PER_ANSWER = 3 # Should we tell http users about the bridge fingerprints? Turn this on # once we have the vidalia/tor interaction fixed for everbody. @@ -243,7 +267,8 @@ EMAIL_GPG_SIGNING_KEY = 'gnupghome/TESTING.subkeys.sec' # it stays there; there is currently no mechanism for changing a bridge's # hashring allocation. # -# The bridges are allocated to these groups with the following proportions: +# Once a bridge is assigned to either of the first two groups, it stays there +# persistently. The bridges are allocated to these groups in a proportion of # # ``HTTPS_SHARE`` : ``EMAIL_SHARE`` : ``RESERVED_SHARE`` # ------------------------------------------------------------------------------ @@ -264,7 +289,9 @@ RESERVED_SHARE = 2 # the number of bridges. FILE_BUCKETS = {} -# Options related to recaptcha support. +# Recaptcha Options +# ----------------- + # Enable/Disable recaptcha RECAPTCHA_ENABLED = False

1 0

[bridgedb/master] Add docstrings to HTTPServer.WebRoot class and render_GET() method.
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit 0f2f138f16e98110ee723cf9845b49dc52345482 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 24 03:37:45 2014 +0000 Add docstrings to HTTPServer.WebRoot class and render_GET() method. --- lib/bridgedb/HTTPServer.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index be5bc44..153918b 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -292,11 +292,23 @@ class WebResource(twisted.web.resource.Resource): rtl=rtl) class WebRoot(twisted.web.resource.Resource): + """The parent resource of all other documents hosted by the webserver.""" + isLeaf = True + def render_GET(self, request): + """Handles requests for the webserver root document. + + For example, this function handles requests for + https://bridges.torproject.org/. + + :type request: :api:`twisted.web.server.Request` + :param request: An incoming request. + """ rtl = usingRTLLang(request) return lookup.get_template('index.html').render(rtl=rtl) + def addWebServer(cfg, dist, sched): """Set up a web server. cfg -- a configuration object from Main. We use these options:

1 0

[bridgedb/master] Fix Sphinx directives in HTTPServer.usingRTLLang().
by isis＠torproject.org 04 Feb '14

04 Feb '14

commit f964f7e8c95258b8ec572374dce772221886ecbf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 24 03:39:30 2014 +0000 Fix Sphinx directives in HTTPServer.usingRTLLang(). --- lib/bridgedb/HTTPServer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 153918b..ea10e0b 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -371,8 +371,7 @@ def addWebServer(cfg, dist, sched): return site def usingRTLLang(request): - """ - Check if we should translate the text into a RTL language + """Check if we should translate the text into a RTL language Retrieve the headers from the request. Obtain the Accept-Language header and decide if we need to translate the text. Install the requisite @@ -380,8 +379,11 @@ def usingRTLLang(request): support. Choose the first language from the header that we support and return True if it is a RTL language, else return False. - :param request twisted.web.server.Request: Incoming request - :returns bool: Language is right-to-left + :type request: :api:`twisted.web.server.Request` + :param request: An incoming request. + :rtype: bool + :returns: ``True`` if the preferred language is right-to-left; ``False`` + otherwise. """ langs = setLocaleFromRequestHeader(request)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2014