January 2020 - tor-commits - lists.torproject.org

[stem/master] Differentiate bytes/unicode in hashes
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 2006edc5ee1878bd5c98e99b3f00c987838ba297 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:54:42 2020 -0800 Differentiate bytes/unicode in hashes Huh. To avoid bulk refactoring our tests we included a small hack that hashed byte and unicode types to the same value. Said another way, a unicde and byte string for "hello" would be equal. I expected that dropping this hack would be invasive but our tests pass. Kinda confused, but... neat? --- stem/util/__init__.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/stem/util/__init__.py b/stem/util/__init__.py index c6b9ce34..2bcc8a07 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -49,19 +49,10 @@ def _hash_value(val): if not HASH_TYPES: my_hash = 0 else: - # TODO: I hate doing this but until Python 2.x support is dropped we - # can't readily be strict about bytes vs unicode for attributes. This - # is because test assertions often use strings, and normalizing this - # would require wrapping most with to_unicode() calls. - # - # This hack will go away when we drop Python 2.x support. - - if isinstance(val, (bytes, str)): - my_hash = hash('str') - else: - # Hashing common builtins (ints, bools, etc) provide consistant values but many others vary their value on interpreter invokation. - - my_hash = hash(str(type(val))) + # Hashing common builtins (ints, bools, etc) provide consistant values but + # many others vary their value on interpreter invokation. + + my_hash = hash(str(type(val))) if isinstance(val, (tuple, list)): for v in val:

1 0

[stem/master] Drop python 2 log object type workaround
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit aa6aaa2e6f664c9fc0a3f76b9405848dc06e47be Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 12:50:58 2020 -0800 Drop python 2 log object type workaround --- stem/util/log.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/stem/util/log.py b/stem/util/log.py index ccf6b4ae..4ef977b1 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -231,13 +231,7 @@ class LogBuffer(logging.Handler): """ def __init__(self, runlevel, yield_records = False): - # TODO: At least in python 2.6 logging.Handler has a bug in that it doesn't - # extend object, causing our super() call to fail. When we drop python 2.6 - # support we should switch back to using super() instead. - # - # super(LogBuffer, self).__init__(level = logging_level(runlevel)) - - logging.Handler.__init__(self, level = logging_level(runlevel)) + super(LogBuffer, self).__init__(level = logging_level(runlevel)) self.formatter = FORMATTER self._buffer = []

1 0

[stem/master] Drop python 2 network testing normalization
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 6d8af3896c9b8313e0b8fddefbdea60c30f120d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 13:02:27 2020 -0800 Drop python 2 network testing normalization Honestly this whole module can now be simplified quite a bit, but simply dropping the python 2.x bits for the moment. --- test/network.py | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/test/network.py b/test/network.py index 5072c5b6..5fea625e 100644 --- a/test/network.py +++ b/test/network.py @@ -127,9 +127,7 @@ class Socks(_socket_socket): :param int expected_size: number of bytes to return - :returns: - * **str** in Python 2 (bytes is str) - * **bytes** in Python 3 + :returns: **bytes** for the requested content :raises: * :class:`socket.error` for socket errors @@ -152,32 +150,21 @@ class Socks(_socket_socket): :param list integers: list of ints to convert - :returns: - * **str** in Python 2 (bytes is str) - * **bytes** in Python 3 + :returns: **bytes** for the requested content """ - if bytes is str: - bytes_ = ''.join([chr(x) for x in integers]) # Python 2 - else: - bytes_ = bytes(integers) # Python 3 - return bytes_ + return bytes(integers) def _bytes_to_ints(self, bytes_): """ - Returns a tuple of integers converted from a string (Python 2) or - bytes (Python 3). + Returns a tuple of integers converted from bytes. - :param str,bytes bytes_: byte string to convert + :param bytes bytes_: byte string to convert :returns: **list** of ints """ - try: - integers = [ord(x) for x in bytes_] # Python 2 - except TypeError: - integers = [x for x in bytes_] # Python 3 - return tuple(integers) + return tuple([x for x in bytes_]) def _pack_string(self, string_): """ @@ -185,16 +172,10 @@ class Socks(_socket_socket): :param str string_: string to convert - :returns: - * **str** in Python 2 (bytes is str) - * **bytes** in Python 3 + :returns: **bytes** for the requested content """ - try: - return struct.pack('>%ss' % len(string_), string_) - except struct.error: - # Python 3: encode str to bytes - return struct.pack('>%ss' % len(string_), string_.encode()) + return struct.pack('>%ss' % len(string_), string_.encode()) def connect(self, address): """

1 0

[stem/master] Drop python 2.6 workaround for lack of setUpClass
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 310e361494795e7d91c0e1dbaca22a537aaaa2a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 13:05:10 2020 -0800 Drop python 2.6 workaround for lack of setUpClass --- test/integ/manual.py | 3 --- test/unit/installation.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/test/integ/manual.py b/test/integ/manual.py index 86811917..3e721ac6 100644 --- a/test/integ/manual.py +++ b/test/integ/manual.py @@ -59,9 +59,6 @@ EXPECTED_EXIT_POLICY_DESCRIPTION_END = 'it applies to both IPv4 and IPv6 address class TestManual(unittest.TestCase): - # TODO: remove when dropping support for python 2.6 - skip_reason = 'setUpClass() unsupported in python 2.6' - @classmethod def setUpClass(self): self.man_path = None diff --git a/test/unit/installation.py b/test/unit/installation.py index a91f0362..4b2a795c 100644 --- a/test/unit/installation.py +++ b/test/unit/installation.py @@ -7,9 +7,6 @@ import test class TestInstallation(unittest.TestCase): - # TODO: remove when dropping support for python 2.6 - skip_reason = 'setUpClass() unsupported in python 2.6' - @classmethod def setUpClass(self): setup_path = os.path.join(test.STEM_BASE, 'setup.py')

1 0

[stem/master] Drop python 2.6 -> 3.5 support
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit a396f57c3a55f34bb9f9d5976fc54fcc6561a8c4 Merge: 4e21371e bdd376bd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 13:28:37 2020 -0800 Drop python 2.6 -> 3.5 support As stated in our release announcement Stem 2.x will discontinue Python 2.x support now that the PSF has dropped it... https://blog.atagar.com/stem-release-1-8/ https://www.python.org/doc/sunset-python-2/ Presuming our next release is a year out, Python 3.6 is the oldest non-EOL version so picking it as our new minimum requirement... https://devguide.python.org/#status-of-python-branches No doubt this compatibility change will let us make far more simplifications, but for the moment simply addressing low hanging fruit. cache_fallback_directories.py | 9 +- cache_manual.py | 9 +- docs/faq.rst | 5 +- run_tests.py | 23 +-- setup.py | 8 +- stem/__init__.py | 2 +- stem/client/__init__.py | 8 - stem/client/cell.py | 4 +- stem/client/datatype.py | 65 ++------ stem/control.py | 27 +--- stem/descriptor/__init__.py | 38 +---- stem/descriptor/bandwidth_file.py | 11 +- stem/descriptor/collector.py | 13 +- stem/descriptor/export.py | 14 +- stem/descriptor/extrainfo_descriptor.py | 7 +- stem/descriptor/hidden_service.py | 8 +- stem/descriptor/microdescriptor.py | 8 +- stem/descriptor/reader.py | 64 +++----- stem/descriptor/remote.py | 11 +- stem/descriptor/router_status_entry.py | 4 +- stem/descriptor/server_descriptor.py | 13 +- stem/directory.py | 22 +-- stem/exit_policy.py | 28 ++-- stem/interpreter/__init__.py | 13 +- stem/interpreter/autocomplete.py | 9 +- stem/interpreter/commands.py | 8 +- stem/interpreter/help.py | 9 +- stem/manual.py | 62 +++----- stem/prereq.py | 107 +------------ stem/process.py | 9 +- stem/response/__init__.py | 13 +- stem/response/events.py | 20 +-- stem/response/getinfo.py | 3 +- stem/response/protocolinfo.py | 4 +- stem/socket.py | 32 ++-- stem/util/__init__.py | 57 +------ stem/util/conf.py | 19 +-- stem/util/connection.py | 13 +- stem/util/enum.py | 2 +- stem/util/log.py | 11 +- stem/util/lru_cache.py | 182 ---------------------- stem/util/ordereddict.py | 133 ---------------- stem/util/proc.py | 12 +- stem/util/str_tools.py | 39 ++--- stem/util/system.py | 2 +- stem/util/test_tools.py | 59 +------ stem/version.py | 8 +- test/integ/connection/authentication.py | 1 - test/integ/connection/connect.py | 20 +-- test/integ/control/base_controller.py | 2 - test/integ/control/controller.py | 107 ++++++------- test/integ/descriptor/collector.py | 1 - test/integ/descriptor/extrainfo_descriptor.py | 2 +- test/integ/descriptor/microdescriptor.py | 2 +- test/integ/descriptor/networkstatus.py | 8 +- test/integ/descriptor/server_descriptor.py | 2 +- test/integ/directory/fallback.py | 1 - test/integ/installation.py | 8 +- test/integ/interpreter.py | 4 - test/integ/manual.py | 26 +--- test/integ/process.py | 49 ++---- test/integ/response/protocolinfo.py | 6 +- test/integ/util/connection.py | 11 +- test/integ/util/proc.py | 1 - test/integ/util/system.py | 27 +--- test/network.py | 35 +---- test/task.py | 18 +-- test/unit/client/size.py | 6 +- test/unit/connection/authentication.py | 8 +- test/unit/connection/connect.py | 19 +-- test/unit/control/controller.py | 8 +- test/unit/descriptor/bandwidth_file.py | 21 +-- test/unit/descriptor/collector.py | 34 ++-- test/unit/descriptor/compression.py | 1 - test/unit/descriptor/export.py | 16 +- test/unit/descriptor/hidden_service_v3.py | 17 +- test/unit/descriptor/networkstatus/document_v3.py | 11 +- test/unit/descriptor/reader.py | 21 +-- test/unit/descriptor/remote.py | 57 +++---- test/unit/descriptor/router_status_entry.py | 9 +- test/unit/descriptor/server_descriptor.py | 31 ++-- test/unit/directory/authority.py | 12 +- test/unit/directory/fallback.py | 29 ++-- test/unit/doctest.py | 8 +- test/unit/exit_policy/policy.py | 6 +- test/unit/installation.py | 5 - test/unit/interpreter/__init__.py | 6 +- test/unit/interpreter/autocomplete.py | 9 +- test/unit/interpreter/commands.py | 8 +- test/unit/manual.py | 53 ++----- test/unit/response/events.py | 8 +- test/unit/response/protocolinfo.py | 8 +- test/unit/tutorial.py | 27 ++-- test/unit/tutorial_examples.py | 49 ++---- test/unit/util/connection.py | 30 ++-- test/unit/util/proc.py | 7 +- test/unit/util/system.py | 8 +- test/unit/version.py | 8 +- 98 files changed, 475 insertions(+), 1623 deletions(-)

1 0

[stem/master] Update FAQ concering compatible python versions
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit bdd376bd9e25dcee54d43a47e10329d92f83cafd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 13:27:40 2020 -0800 Update FAQ concering compatible python versions --- docs/faq.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 63800b36..6bbc2f9a 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -86,7 +86,10 @@ Ubuntu you can install these with... What Python versions is Stem compatible with? --------------------------------------------- -Stem works with **Python 2.6 and greater**, including the Python 3.x series. +Stem works with **Python 3.6 and greater**. + +If you require a deprecated Python version then please use Stem 1.8, which was +compatible with **Python 2.6 and above**. .. _can_i_interact_with_tors_controller_interface_directly:

1 0

[stem/master] Drop python 3 specific instructions from PyPI
by atagar＠torproject.org 05 Jan '20

05 Jan '20

commit 56ff2d57125954f1edc5958b0b2366de0e8f55ee Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 5 13:08:03 2020 -0800 Drop python 3 specific instructions from PyPI --- setup.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 8b6f1e4b..52b62dca 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ # # * Recache latest information (cache_manual.py and cache_fallback_directories.py) # -# * Test with python2.6, python2.7, python3, and pypy. +# * Test with python3 and pypy. # |- If using tox run... # | # | % tox -- --all --target RUN_ALL,ONLINE @@ -92,11 +92,7 @@ To install you can either use... pip install stem -... or install from the source tarball. Stem supports both the python 2.x and 3.x series. To use its python3 counterpart you simply need to install using that version of python. - -:: - - python3 setup.py install +... or install from the source tarball. Stem supports Python 3.6 and above. After that, give some `tutorials <https://stem.torproject.org/tutorials.html>`_ a try! For questions or to discuss project ideas we're available on `irc <https://www.torproject.org/about/contact.html.en#irc>`_ and the `tor-dev@ email list <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev>`_. """.strip()

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 05 Jan '20

05 Jan '20

commit dcf95b8e0b4ded621c50fb21a98dfc1157e5a719 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 20:55:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index 1b2f11202e..fedde7503b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -2999,6 +2999,8 @@ msgid "" "In theory, only physical access should compromise your system because Gmail " "and similar services should only send the cookie over an SSL link." msgstr "" +"В принципе, такое возможно только с физическим доступом, потому что Gmail и " +"другие подобные сервисы отправляют куки-файлы по каналу, защищенному SSL." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -3006,6 +3008,8 @@ msgid "" "In practice, alas, it's [way more complex than that](https://fscked.org/blog" "/fully-automated-active-https-cookie-hijacking)." msgstr "" +"Но в жизни [бывает всякое](https://fscked.org/blog/fully-automated-active-" +"https-cookie-hijacking)." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -3030,7 +3034,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-46/ #: (content/tbb/tbb-46/contents+en.lrquestion.title) msgid "How do I install Tor Browser?" -msgstr "" +msgstr "Как установить Tor Browser?" #: https//support.torproject.org/tbb/tbb-46/ #: (content/tbb/tbb-46/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 05 Jan '20

05 Jan '20

commit 855e5a4e8c4f4ade2bb823113d0cc9a9d7b6da12 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 20:24:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index 70a2cd4408..1b2f11202e 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -2915,6 +2915,10 @@ msgid "" "they are Tor exit relays), and tries to warn any connections coming from " "those IP addresses that recent queries indicate an infection." msgstr "" +"Другой вариант: Google пытается распознавать некоторые виды шпионских " +"программ и вирусов, которые и в самом деле отправляют запросы поисковику. " +"Google фиксирует IP-адреса, с которых приходят такие запросы (не распознавая" +" выходные узлы Tor) и предупреждает о всякой активности с этих адресов." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -2923,11 +2927,14 @@ msgid "" " deter or block Tor use. The error message about an infected machine should " "clear up again after a short time." msgstr "" +"Насколько нам известно, Google не делает преднамеренных шагов для " +"ограничения или блокирования трафика Tor. Сообщение о зараженном устройстве " +"через некоторое время перестает вам досаждать." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.title) msgid "Gmail warns me that my account may have been compromised" -msgstr "" +msgstr "Gmail сообщает, что мой аккаунт может быть скомпрометирован" #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2935,6 +2942,8 @@ msgid "" "Sometimes, after you've used Gmail over Tor, Google presents a pop-up " "notification that your account may have been compromised." msgstr "" +"При использовании Gmail через Tor случается, что Google показывает " +"всплывающее окно с предупреждением о скомпрометированном аккаунте." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2942,6 +2951,8 @@ msgid "" "The notification window lists a series of IP addresses and locations " "throughout the world recently used to access your account." msgstr "" +"В этом окне отображаются IP-адреса и местоположение тех, кто недавно получал" +" доступ к вашему аккаунту." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2951,6 +2962,9 @@ msgid "" " was a good idea to confirm the account was being accessed by its rightful " "owner." msgstr "" +"Это ложный сигнал тревоги. Google видит входы в аккаунт из разных " +"географических точек (нормально при использовании Tor) и решает, что неплохо" +" бы подтвердить личность владельца аккаунта." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2958,6 +2972,8 @@ msgid "" "Even though this may be a byproduct of using the service via Tor, that " "doesn't mean you can entirely ignore the warning." msgstr "" +"Но даже если это побочный эффект от использования Tor, не следует полностью " +"игнорировать предупреждение." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2965,6 +2981,8 @@ msgid "" "It is probably a false positive, but it might not be since it is possible " "for someone to hijack your Google cookie." msgstr "" +"Может, это ложный сигнал, но что если нет? Злоумышленник в принципе мог " +"получить доступ к вашему cookie-файлу Google." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2972,6 +2990,8 @@ msgid "" "Cookie hijacking is possible by either physical access to your computer or " "by watching your network traffic." msgstr "" +"Это возможно, если у злоумышленника есть физический доступ к компьютеру, " +"либо он наблюдает за вами по сети." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 05 Jan '20

05 Jan '20

commit b53ec349613dc4d14616e9fa96ce988dccf94140 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 19:24:44 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index f31009c4a4..70a2cd4408 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -2868,12 +2868,16 @@ msgstr "https://encrypted.google.com/search?q=online%20anonymity&hl=en" msgid "" "Another method is to simply use your country code for accessing Google. This" " can be google.be, google.de, google.us and so on." -msgstr "Вы также можете использовать домен свое" +msgstr "" +"Вы также можете использовать для Google домен своей страны, например, " +"google.be, google.de, google.us и так далее." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.title) msgid "Google makes me solve a CAPTCHA or tells me I have spyware installed" msgstr "" +"Google заставляет меня разбираться с капчей или сообщает, что у меня " +"программа-шпион" #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -2881,6 +2885,8 @@ msgid "" "This is a known and intermittent problem; it does not mean that Google " "considers Tor to be spyware." msgstr "" +"Известная проблема, которая то и дело проявляется. Нет, Google на самом деле" +" не считает Tor Browser шпионской программой." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description) @@ -2892,6 +2898,13 @@ msgid "" "relay you happened to pick) as somebody trying to \"crawl\" their website, " "so it slows down traffic from that IP address for a short time." msgstr "" +"Когда вы используете Tor, то отправляете запросы через выходные узлы. Этими " +"же узлами пользуются тысячи других людей. Сообщение о программе-шпионе " +"появляется, если много пользователей Tor пытаются отправить запросы в Google" +" за короткий промежуток времени. Google видит, что с одного IP-адреса " +"приходит большой трафик (но Google не знает, что это выходной узел Tor). " +"Выглядит так, будто кто-то ползает по сайту Google с этого IP-адреса. " +"Поэтому Google на некоторое время замедляет трафик с этого адреса." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description)

1 0