September 2017 - tor-commits - lists.torproject.org

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 38a51ccdf331ecdb2d229567d70fa1419f3bb2c0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 17:18:18 2017 +0000 Update translations for tor-messenger-authdtd --- ky/auth.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ky/auth.dtd b/ky/auth.dtd index cb7cc5cbd..b8dc52a8f 100644 --- a/ky/auth.dtd +++ b/ky/auth.dtd @@ -2,8 +2,8 @@ <!ENTITY authDialog.authenticate "Verify"> <!ENTITY authDialog.cancel "Айнуу"> <!ENTITY authDialog.help "Жардам"> -<!ENTITY authDialog.yes "Yes"> -<!ENTITY authDialog.no "No"> +<!ENTITY authDialog.yes "Ооба"> +<!ENTITY authDialog.no "Жок"> <!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> <!ENTITY authDialog.yourFingerprint "Your fingerprint"> <!ENTITY authDialog.theirFingerprint "Their purported fingerprint">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 41cba3c3b55ad57568a87da9edcb72d4933611e4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 17:16:30 2017 +0000 Update translations for tor-launcher-network-settings --- ky/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ky/network-settings.dtd b/ky/network-settings.dtd index 5349f81bb..2fc30764d 100644 --- a/ky/network-settings.dtd +++ b/ky/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ооба"> +<!ENTITY torSettings.no "Жок"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit c71472ada66303f3280ee3eccf09b086c71cdf2c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 17:15:32 2017 +0000 Update translations for https_everywhere --- ky/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ky/ssl-observatory.dtd b/ky/ssl-observatory.dtd index 69f1cfd69..60d754dea 100644 --- a/ky/ssl-observatory.dtd +++ b/ky/ssl-observatory.dtd @@ -1,7 +1,7 @@  <!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> <!ENTITY ssl-observatory.popup.later "Ask Me Later"> -<!ENTITY ssl-observatory.popup.no "No"> +<!ENTITY ssl-observatory.popup.no "Жок"> <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks against your browser by sending the certificates you receive to the @@ -15,7 +15,7 @@ to turn it on?">--> <!ENTITY ssl-observatory.popup.title "Should HTTPS Everywhere use the SSL Observatory?"> -<!ENTITY ssl-observatory.popup.yes "Yes"> +<!ENTITY ssl-observatory.popup.yes "Ооба">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 5cf25af5e8b7121f575995dc6b7452faf3a46786 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 17:15:04 2017 +0000 Update translations for bridgedb --- ky/LC_MESSAGES/bridgedb.po | 337 +++++++++++++++++++++++---------------------- 1 file changed, 169 insertions(+), 168 deletions(-) diff --git a/ky/LC_MESSAGES/bridgedb.po b/ky/LC_MESSAGES/bridgedb.po index d8fef60c8..3a6830124 100644 --- a/ky/LC_MESSAGES/bridgedb.po +++ b/ky/LC_MESSAGES/bridgedb.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Kirgyz (http://www.transifex.com/projects/p/torproject/language/ky/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2017-09-08 17:08+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"Language-Team: Kyrgyz (http://www.transifex.com/otf/torproject/language/ky/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ky\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -28,57 +29,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Жок" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -89,7 +215,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -100,7 +226,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -112,7 +238,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -121,20 +247,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -142,12 +268,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -155,48 +281,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -205,21 +331,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -227,153 +353,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[stem/master] Run test_launch_tor_with_timeout in serial
by atagar＠torproject.org 08 Sep '17

08 Sep '17

commit 3cc85fc9dbb907965279cca4d844999d57010a2b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Sep 8 10:08:14 2017 -0700 Run test_launch_tor_with_timeout in serial Huh. Works on my laptop but on my desktop one of the tests are failing. I suspect the issue is that running it at the same time we're running others in parallel starves the test for resources, causing it to take too long. Test reliability is far more important than a tiny bit of runtime. On its own this test is pretty quick anyway. :) ====================================================================== FAIL: test_launch_tor_with_timeout ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 150, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 212, in result test.fail(self._result.msg) AssertionError: Test should have taken 0.05-3 seconds, took 3.4 instead ---------------------------------------------------------------------- --- test/integ/process.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index dea0b4c3..00929ce1 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -45,6 +45,8 @@ PublishServerDescriptor 0 DataDirectory %s """ +TOR_CMD = None + def random_port(): while True: @@ -110,9 +112,12 @@ def run_tor(tor_cmd, *args, **kwargs): class TestProcess(unittest.TestCase): @staticmethod def run_tests(args): + global TOR_CMD + TOR_CMD = args.tor_cmd + for func, async_test in stem.util.test_tools.ASYNC_TESTS.items(): if func.startswith('test.integ.process.'): - async_test.run(args.tor_cmd) + async_test.run(TOR_CMD) @asynchronous def test_version_argument(tor_cmd): @@ -535,8 +540,7 @@ class TestProcess(unittest.TestCase): except OSError as exc: assert_equal('Process terminated: Failed to bind one of the listener ports.', str(exc)) - @asynchronous - def test_launch_tor_with_timeout(tor_cmd): + def test_launch_tor_with_timeout(self): """ Runs launch_tor where it times out before completing. """ @@ -546,7 +550,7 @@ class TestProcess(unittest.TestCase): try: stem.process.launch_tor_with_config( - tor_cmd = tor_cmd, + tor_cmd = TOR_CMD, timeout = 0.05, config = { 'SocksPort': random_port(),

1 0

[stem/master] Slackware's man command doesn't have --encoding argument
by atagar＠torproject.org 08 Sep '17

08 Sep '17

commit e5cef4f95f26fc8182b50129df7cd78f91f5520d Merge: c6b473f2 8737fa98 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Sep 8 09:50:47 2017 -0700 Slackware's man command doesn't have --encoding argument Patch by ewong on... https://trac.torproject.org/projects/tor/ticket/18660 stem/manual.py | 3 ++- stem/util/system.py | 11 +++++++++++ test/integ/manual.py | 2 +- test/unit/manual.py | 17 +++++++++-------- 4 files changed, 23 insertions(+), 10 deletions(-)

1 0

[stem/master] Change 'man command has --encoding arg' check to a constant
by atagar＠torproject.org 08 Sep '17

08 Sep '17

commit 8737fa984a52f216e514747d0562e38b695276dd Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Sep 8 09:39:44 2017 -0700 Change 'man command has --encoding arg' check to a constant We might want to make this a dynamic check later but if we do it'll be done differently. --- stem/manual.py | 3 ++- stem/util/system.py | 42 ++++++++++++------------------------------ test/integ/manual.py | 2 +- test/unit/manual.py | 11 +++++------ 4 files changed, 20 insertions(+), 38 deletions(-) diff --git a/stem/manual.py b/stem/manual.py index ede02faf..e436c866 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -84,6 +84,7 @@ Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'RELAY', 'DIRECTORY', 'AUTHO GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/tor.1.txt' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'cached_tor_manual.sqlite') DATABASE = None # cache database connections +HAS_ENCODING_ARG = stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware() SCHEMA_VERSION = 1 # version of our scheme, bump this if you change the following SCHEMA = ( @@ -485,7 +486,7 @@ class Manual(object): :raises: **IOError** if unable to retrieve the manual """ - man_cmd = 'man %s -P cat %s' % ('' if (stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware()) else '--encoding=ascii', man_path) + man_cmd = 'man %s -P cat %s' % ('' if HAS_ENCODING_ARG else '--encoding=ascii', man_path) try: man_output = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'}) diff --git a/stem/util/system.py b/stem/util/system.py index 53c06ac8..3a40e13d 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -21,10 +21,8 @@ best-effort, providing **None** if the lookup fails. is_windows - checks if we're running on windows is_mac - checks if we're running on a mac is_gentoo - checks if we're running on gentoo - is_bsd - checks if we're running on the bsd family of operating systems is_slackware - checks if we're running on slackware - - has_encoding_man - checks if the system's man command has --encoding=ascii available + is_bsd - checks if we're running on the bsd family of operating systems is_available - determines if a command is available on this system is_running - determines if a given process is running @@ -313,18 +311,6 @@ class DaemonTask(object): conn.close() -def has_encoding_man(): - """ - Checks if --encoding=ascii is available for man - """ - retval = True - if is_available('man'): - result = call('man --encoding=ascii man', [], error_return=True) - if 'unrecognized option' in result: - retval = False - return retval - - def is_windows(): """ Checks if we are running on Windows. @@ -355,25 +341,25 @@ def is_gentoo(): return os.path.exists('/etc/gentoo-release') -def is_bsd(): +def is_slackware(): """ - Checks if we are within the BSD family of operating systems. This currently - recognizes Macs, FreeBSD, and OpenBSD but may be expanded later. + Checks if we are running on a Slackware system. - :returns: **bool** to indicate if we're on a BSD OS + :returns: **bool** to indicate if we're on a Slackware system """ - return platform.system() in ('Darwin', 'FreeBSD', 'OpenBSD') + return os.path.exists('/etc/slackware-version') -def is_slackware(): +def is_bsd(): """ - Checks if we are running on a Slackware system. + Checks if we are within the BSD family of operating systems. This currently + recognizes Macs, FreeBSD, and OpenBSD but may be expanded later. - :returns: **bool** to indicate if we're on a Slackware system + :returns: **bool** to indicate if we're on a BSD OS """ - return os.path.exists('/etc/slackware-version') + return platform.system() in ('Darwin', 'FreeBSD', 'OpenBSD') def is_available(command, cached=True): @@ -1238,8 +1224,7 @@ def files_with_suffix(base_path, suffix): yield os.path.join(root, filename) -def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = None, - cwd = None, env = None, error_return = False): +def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = None, cwd = None, env = None): """ call(command, default = UNDEFINED, ignore_exit_status = False) @@ -1311,10 +1296,7 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = Non exit_status = process.poll() if not ignore_exit_status and exit_status != 0: - if error_return: - return stderr - else: - OSError('%s returned exit status %i' % (command, exit_status)) + raise OSError('%s returned exit status %i' % (command, exit_status)) if stdout: return stdout.decode('utf-8', 'replace').splitlines() diff --git a/test/integ/manual.py b/test/integ/manual.py index 85de28c9..4c000b98 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -107,7 +107,7 @@ class TestManual(unittest.TestCase): stem.manual.download_man_page(file_handle = tmp) self.man_path = tmp.name - man_cmd = 'man %s -P cat %s' % ('' if not stem.util.system.has_encoding_man() else '--encoding=ascii', self.man_path) + man_cmd = 'man %s -P cat %s' % ('' if not stem.manual.HAS_ENCODING_ARG else '--encoding=ascii', self.man_path) self.man_content = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'}) except Exception as exc: self.download_error = 'Unable to download the man page: %s' % exc diff --git a/test/unit/manual.py b/test/unit/manual.py index 9850e827..6640baf2 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -153,7 +153,7 @@ class TestManual(unittest.TestCase): expand our example (or add another). """ - if not stem.util.system.has_encoding_man(): + if not stem.manual.HAS_ENCODING_ARG: self.skipTest('(man lacks --encoding arg on OSX, BSD, and Slackware #18660)') return @@ -174,7 +174,7 @@ class TestManual(unittest.TestCase): options. Unlike most other tests this doesn't require network access. """ - if not stem.util.system.has_encoding_man(): + if not stem.manual.HAS_ENCODING_ARG: self.skipTest('(man lacks --encoding arg on OSX and BSD and Slackware, #18660)') return @@ -202,7 +202,7 @@ class TestManual(unittest.TestCase): Check that we can save and reload manuals as a config. """ - if not stem.util.system.has_encoding_man(): + if not stem.manual.HAS_ENCODING_ARG: self.skipTest('(man lacks --encoding arg on OSX, BSD and Slackware, #18660)') return @@ -219,7 +219,7 @@ class TestManual(unittest.TestCase): Check that we can save and reload manuals as sqlite. """ - if not stem.util.system.has_encoding_man(): + if not stem.manual.HAS_ENCODING_ARG: self.skipTest('(man lacks --encoding arg on OSX, BSD, and Slackware #18660)') return @@ -297,9 +297,8 @@ class TestManual(unittest.TestCase): self.assertEqual(b'a2x output', output.getvalue()) call_mock.assert_called_once_with('a2x -f manpage /no/such/path/tor.1.txt') - @patch('stem.util.system.has_encoding_man', Mock(return_value = True)) - @patch('stem.util.system.is_bsd', Mock(return_value = False)) @patch('stem.util.system.is_mac', Mock(return_value = False)) + @patch('stem.util.system.is_bsd', Mock(return_value = False)) @patch('stem.util.system.is_slackware', Mock(return_value = False)) @patch('stem.util.system.call', Mock(side_effect = OSError('man --encoding=ascii -P cat tor returned exit status 16'))) def test_from_man_when_manual_is_unavailable(self):

1 0

[stem/master] change manual.py in integ to use has_encoding_man
by atagar＠torproject.org 08 Sep '17

08 Sep '17

commit e55636d62481d3f7b1f3c70fa217bc6f69032feb Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Fri Sep 8 20:24:27 2017 +0800 change manual.py in integ to use has_encoding_man --- test/integ/manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/manual.py b/test/integ/manual.py index 846b1b6e..85de28c9 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -107,7 +107,7 @@ class TestManual(unittest.TestCase): stem.manual.download_man_page(file_handle = tmp) self.man_path = tmp.name - man_cmd = 'man %s -P cat %s' % ('' if stem.util.system.is_mac() else '--encoding=ascii', self.man_path) + man_cmd = 'man %s -P cat %s' % ('' if not stem.util.system.has_encoding_man() else '--encoding=ascii', self.man_path) self.man_content = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'}) except Exception as exc: self.download_error = 'Unable to download the man page: %s' % exc

1 0

[stem/master] Skip tests for Slackware systems
by atagar＠torproject.org 08 Sep '17

08 Sep '17

commit b7d101280b3e667c694a5d6753ac308aa66aa40f Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Fri Sep 8 19:47:27 2017 +0800 Skip tests for Slackware systems --- stem/manual.py | 2 +- stem/util/system.py | 11 +++++++++++ test/unit/manual.py | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/stem/manual.py b/stem/manual.py index 3440b36d..ede02faf 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -485,7 +485,7 @@ class Manual(object): :raises: **IOError** if unable to retrieve the manual """ - man_cmd = 'man %s -P cat %s' % ('' if (stem.util.system.is_mac() or stem.util.system.is_bsd()) else '--encoding=ascii', man_path) + man_cmd = 'man %s -P cat %s' % ('' if (stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware()) else '--encoding=ascii', man_path) try: man_output = stem.util.system.call(man_cmd, env = {'MANWIDTH': '10000000'}) diff --git a/stem/util/system.py b/stem/util/system.py index a563db45..47527795 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -22,6 +22,7 @@ best-effort, providing **None** if the lookup fails. is_mac - checks if we're running on a mac is_gentoo - checks if we're running on gentoo is_bsd - checks if we're running on the bsd family of operating systems + is_slackware - checks if we're running on slackware is_available - determines if a command is available on this system is_running - determines if a given process is running @@ -351,6 +352,16 @@ def is_bsd(): return platform.system() in ('Darwin', 'FreeBSD', 'OpenBSD') +def is_slackware(): + """ + Checks if we are running on a Slackware system. + + :returns: **bool** to indicate if we're on a Slackware system + """ + + return os.path.exists('/etc/slackware-version') + + def is_available(command, cached=True): """ Checks the current PATH to see if a command is available or not. If more diff --git a/test/unit/manual.py b/test/unit/manual.py index aa8cede1..cd850af9 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -153,7 +153,7 @@ class TestManual(unittest.TestCase): expand our example (or add another). """ - if stem.util.system.is_mac() or stem.util.system.is_bsd(): + if stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware(): self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') return @@ -174,8 +174,8 @@ class TestManual(unittest.TestCase): options. Unlike most other tests this doesn't require network access. """ - if stem.util.system.is_mac() or stem.util.system.is_bsd(): - self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') + if stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware(): + self.skipTest('(man lacks --encoding arg on OSX and BSD and Slackware, #18660)') return manual = stem.manual.Manual.from_man(UNKNOWN_OPTIONS_MAN_PATH) @@ -299,6 +299,7 @@ class TestManual(unittest.TestCase): @patch('stem.util.system.is_mac', Mock(return_value = False)) @patch('stem.util.system.is_bsd', Mock(return_value = False)) + @patch('stem.util.system.is_slackware', Mock(return_value = False)) @patch('stem.util.system.call', Mock(side_effect = OSError('man --encoding=ascii -P cat tor returned exit status 16'))) def test_from_man_when_manual_is_unavailable(self): exc_msg = "Unable to run 'man --encoding=ascii -P cat tor': man --encoding=ascii -P cat tor returned exit status 16"

1 0

[stem/master] add has_encoding_man() to stem.util.system
by atagar＠torproject.org 08 Sep '17

08 Sep '17

commit 7932884d0e942fffad7f1deb80143fe5b57dcbea Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Fri Sep 8 20:21:20 2017 +0800 add has_encoding_man() to stem.util.system --- stem/util/system.py | 22 ++++++++++++++++++++-- test/unit/manual.py | 17 +++++++++-------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 47527795..53c06ac8 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -24,6 +24,8 @@ best-effort, providing **None** if the lookup fails. is_bsd - checks if we're running on the bsd family of operating systems is_slackware - checks if we're running on slackware + has_encoding_man - checks if the system's man command has --encoding=ascii available + is_available - determines if a command is available on this system is_running - determines if a given process is running size_of - provides the memory usage of an object @@ -311,6 +313,18 @@ class DaemonTask(object): conn.close() +def has_encoding_man(): + """ + Checks if --encoding=ascii is available for man + """ + retval = True + if is_available('man'): + result = call('man --encoding=ascii man', [], error_return=True) + if 'unrecognized option' in result: + retval = False + return retval + + def is_windows(): """ Checks if we are running on Windows. @@ -1224,7 +1238,8 @@ def files_with_suffix(base_path, suffix): yield os.path.join(root, filename) -def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = None, cwd = None, env = None): +def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = None, + cwd = None, env = None, error_return = False): """ call(command, default = UNDEFINED, ignore_exit_status = False) @@ -1296,7 +1311,10 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, timeout = Non exit_status = process.poll() if not ignore_exit_status and exit_status != 0: - raise OSError('%s returned exit status %i' % (command, exit_status)) + if error_return: + return stderr + else: + OSError('%s returned exit status %i' % (command, exit_status)) if stdout: return stdout.decode('utf-8', 'replace').splitlines() diff --git a/test/unit/manual.py b/test/unit/manual.py index cd850af9..9850e827 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -153,8 +153,8 @@ class TestManual(unittest.TestCase): expand our example (or add another). """ - if stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware(): - self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') + if not stem.util.system.has_encoding_man(): + self.skipTest('(man lacks --encoding arg on OSX, BSD, and Slackware #18660)') return manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) @@ -174,7 +174,7 @@ class TestManual(unittest.TestCase): options. Unlike most other tests this doesn't require network access. """ - if stem.util.system.is_mac() or stem.util.system.is_bsd() or stem.util.system.is_slackware(): + if not stem.util.system.has_encoding_man(): self.skipTest('(man lacks --encoding arg on OSX and BSD and Slackware, #18660)') return @@ -202,8 +202,8 @@ class TestManual(unittest.TestCase): Check that we can save and reload manuals as a config. """ - if stem.util.system.is_mac() or stem.util.system.is_bsd(): - self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') + if not stem.util.system.has_encoding_man(): + self.skipTest('(man lacks --encoding arg on OSX, BSD and Slackware, #18660)') return manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) @@ -219,8 +219,8 @@ class TestManual(unittest.TestCase): Check that we can save and reload manuals as sqlite. """ - if stem.util.system.is_mac() or stem.util.system.is_bsd(): - self.skipTest('(man lacks --encoding arg on OSX and BSD, #18660)') + if not stem.util.system.has_encoding_man(): + self.skipTest('(man lacks --encoding arg on OSX, BSD, and Slackware #18660)') return manual = stem.manual.Manual.from_man(EXAMPLE_MAN_PATH) @@ -297,8 +297,9 @@ class TestManual(unittest.TestCase): self.assertEqual(b'a2x output', output.getvalue()) call_mock.assert_called_once_with('a2x -f manpage /no/such/path/tor.1.txt') - @patch('stem.util.system.is_mac', Mock(return_value = False)) + @patch('stem.util.system.has_encoding_man', Mock(return_value = True)) @patch('stem.util.system.is_bsd', Mock(return_value = False)) + @patch('stem.util.system.is_mac', Mock(return_value = False)) @patch('stem.util.system.is_slackware', Mock(return_value = False)) @patch('stem.util.system.call', Mock(side_effect = OSError('man --encoding=ascii -P cat tor returned exit status 16'))) def test_from_man_when_manual_is_unavailable(self):

1 0