[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
commit 3f8d17e4ed271f52fd3df3546b071f3dbb02a200 Author: Translation commit botDate: Sun May 27 02:18:32 2018 + Update translations for tails-openpgp-applet --- ar/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot index e90cf0e9b..24e9aa9cb 100644 --- a/ar/openpgp-applet.pot +++ b/ar/openpgp-applet.pot @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: ta...@boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-04-12 19:13+\n" -"Last-Translator: ButterflyOfFire\n" +"PO-Revision-Date: 2018-05-27 02:01+\n" +"Last-Translator: abidin toumi \n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits
commit 8e68b613b5c9b7923040544a6e74ab54934ea581 Author: Translation commit botDate: Sun May 27 02:18:48 2018 + Update translations for tails-onioncircuits --- ar/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot index 7167b2eaf..8cfb12751 100644 --- a/ar/onioncircuits.pot +++ b/ar/onioncircuits.pot @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2018-04-12 19:13+\n" -"Last-Translator: IDRASSI Mounir \n" +"PO-Revision-Date: 2018-05-27 02:01+\n" +"Last-Translator: abidin toumi \n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
commit 7d49a5d97eb06118d73d15ad7ebbfd66845b4465 Author: Translation commit botDate: Sun May 27 02:18:53 2018 + Update translations for tails-onioncircuits_completed --- ar/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot index 7167b2eaf..8cfb12751 100644 --- a/ar/onioncircuits.pot +++ b/ar/onioncircuits.pot @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+\n" -"PO-Revision-Date: 2018-04-12 19:13+\n" -"Last-Translator: IDRASSI Mounir \n" +"PO-Revision-Date: 2018-05-27 02:01+\n" +"Last-Translator: abidin toumi \n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 40d82e6f03772f98c9c7a065ee5df13dcd7f3b04 Author: Translation commit botDate: Sun May 27 02:17:00 2018 + Update translations for tails-misc --- ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index 94d65047b..0572221a7 100644 --- a/ar.po +++ b/ar.po @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-05-20 11:15+\n" -"Last-Translator: Khaled Hosny \n" +"PO-Revision-Date: 2018-05-27 01:50+\n" +"Last-Translator: abidin toumi \n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Fix PyPy compatibility
commit c52db0424ca14b28a17492132303068018167919 Author: Damian JohnsonDate: Sat May 26 13:47:10 2018 -0700 Fix PyPy compatibility Great catch from Mike that Stem 1.6 broke PyPy compatibility. Adding this to the list of things we check at release time... https://trac.torproject.org/projects/tor/ticket/26207 --- docs/change_log.rst| 1 + setup.py | 3 +++ stem/client/cell.py| 5 +++-- stem/prereq.py | 13 + stem/util/system.py| 14 +++--- test/integ/installation.py | 7 ++- test/integ/util/system.py | 5 + test/unit/util/system.py | 11 --- 8 files changed, 50 insertions(+), 9 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 8d1f302d..944d3577 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -78,6 +78,7 @@ The following are only available within Stem's `git repository * **Utilities** + * Fixed PyPy compatibility (:trac:`26207`) * Connection information from proc limited to 10,000 results * **Website** diff --git a/setup.py b/setup.py index 1d674e13..8449ce76 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,9 @@ # # * Recache latest information (cache_manual.py and cache_fallback_directories.py) # +# * Run 'run_tests.py --all --target RUN_ALL,ONLINE' with python2.6, python2.7, +# python3, and pypy. +# # * Tag the release # |- Bump stem's version (in stem/__init__.py and docs/index.rst). # |- git commit -a -m "Stem release 1.0.0" diff --git a/stem/client/cell.py b/stem/client/cell.py index d0a98ada..ce9392b2 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -302,9 +302,10 @@ class RelayCell(CircuitCell): IS_FIXED_SIZE = True def __init__(self, circ_id, command, data, digest = 0, stream_id = 0, recognized = 0): -if 'hashlib.HASH' in str(type(digest)): +if 'HASH' in str(type(digest)): # Unfortunately hashlib generates from a dynamic private class so - # isinstance() isn't such a great option. + # isinstance() isn't such a great option. With python2/python3 the + # name is 'hashlib.HASH' whereas PyPy calls it just 'HASH'. digest = Size.LONG.unpack(digest.digest()[:4]) elif stem.util._is_str(digest): diff --git a/stem/prereq.py b/stem/prereq.py index 6e230007..6989095c 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -22,6 +22,7 @@ Checks for stem dependencies. We require python 2.6 or greater (including the """ import inspect +import platform import sys try: @@ -89,6 +90,18 @@ def is_python_3(): return sys.version_info[0] == 3 +def is_pypy(): + """ + Checks if we're running PyPy. + + .. versionadded:: 1.7.0 + + :returns: **True** if running pypy, **False** otherwise + """ + + return platform.python_implementation() == 'PyPy' + + @lru_cache() def is_sqlite_available(): """ diff --git a/stem/util/system.py b/stem/util/system.py index 3eb2fd4d..9a69fe96 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -80,6 +80,7 @@ import tarfile import threading import time +import stem.prereq import stem.util import stem.util.enum import stem.util.proc @@ -95,8 +96,6 @@ State = stem.util.enum.UppercaseEnum( 'FAILED', ) -DEFAULT_SIZE = sys.getsizeof(0) # estimate if object lacks a __sizeof__ - SIZE_RECURSES = { tuple: iter, list: iter, @@ -476,14 +475,23 @@ def size_of(obj, exclude = None): :param set exclude: object ids to exclude from size estimation :returns: **int** with the size of the object in bytes + + :raises: **NotImplementedError** if using PyPy """ + if stem.prereq.is_pypy(): +raise NotImplementedError('PyPy does not implement sys.getsizeof()') + if exclude is None: exclude = set() elif id(obj) in exclude: return 0 - size = sys.getsizeof(obj, DEFAULT_SIZE) + try: +size = sys.getsizeof(obj) + except TypeError: +size = sys.getsizeof(0) # estimate if object lacks a __sizeof__ + exclude.add(id(obj)) if type(obj) in SIZE_RECURSES: diff --git a/test/integ/installation.py b/test/integ/installation.py index 0fe0351a..2ac655aa 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -11,6 +11,7 @@ import time import unittest import stem +import stem.prereq import stem.util.system import stem.util.test_tools import test @@ -73,7 +74,11 @@ class TestInstallation(unittest.TestCase): try: stem.util.system.call('%s setup.py install --prefix %s' % (PYTHON_EXE, BASE_INSTALL_PATH), timeout = 60, cwd = test.STEM_BASE) stem.util.system.call('%s setup.py clean --all' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) # tidy up the build directory -site_packages_paths = glob.glob('%s/lib*/*/site-packages' % BASE_INSTALL_PATH) + +if stem.prereq.is_pypy(): + site_packages_paths = glob.glob('%s/site-packages' % BASE_INSTALL_PATH) +else: +
[tor-commits] [metrics-web/master] Update to latest metrics-lib.
commit 1072602b66074e8b86f6a5880005eede67cdbdb0 Author: Karsten LoesingDate: Sat May 26 21:43:34 2018 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index 77bbd74..feabf88 16 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 77bbd742b63fd9708694d7d8623d82a9654b770e +Subproject commit feabf88fff34465134da9ea61592f7f9c30415b7 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [metrics-web/master] Put back updated OOI link.
commit ca6353e188e277a4461354e7e3aad6c63cd4212b Author: Karsten LoesingDate: Sat May 26 21:35:07 2018 +0200 Put back updated OOI link. Resolves #25926. --- src/main/resources/web/json/metrics.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index b867f50..8dbdc66 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -279,7 +279,7 @@ "id": "oxford-anonymous-internet", "title": "The anonymous Internet", "type": "Link", -"description": "The Oxford Internet Institute made a cartogram visualization of Tor users as compared to the overall Internet population. They used the average number of Tor users per country from August 2012 to August 2013 and put it in relation to total Internet users per country. " +"description": "The Oxford Internet Institute made a cartogram visualization of Tor users as compared to the overall Internet population. They used the average number of Tor users per country from August 2012 to August 2013 and put it in relation to total Internet users per country. More details and conclusions can be found on the http://geography.oii.ox.ac.uk/the-anonymous-internet/\; target=\"_blank\">Information Geographies website at the Oxford Internet Institute.http://geography.oii.ox.ac.uk/the-anonymous-internet/\;>" }, { "id": "torperf", ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit 3376fa32443a79d1553ac2e3bd0126da5ffbb477 Author: Translation commit botDate: Sat May 26 16:17:13 2018 + Update translations for torbutton-torbuttonproperties --- he/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/torbutton.properties b/he/torbutton.properties index 0a266e202..cc5068aca 100644 --- a/he/torbutton.properties +++ b/he/torbutton.properties @@ -2,11 +2,11 @@ torbutton.circuit_display.internet = ××× ××¨× × torbutton.circuit_display.ip_unknown = IP ×××ª× ××××¢ torbutton.circuit_display.onion_site = ×תר ××¦× torbutton.circuit_display.this_browser = ×פ××¤× ×× -torbutton.circuit_display.relay = ××ס×ר +torbutton.circuit_display.relay = ××סר torbutton.circuit_display.tor_bridge = ×שר torbutton.circuit_display.unknown_country = ×××× × ×× ××××¢× -torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.guard = ×ִש××ָר +torbutton.circuit_display.guard_note = צ××ת [Guard] ש×× ×¢×©×× ×× ×××©×ª× ×ת. torbutton.circuit_display.learn_more = ××× ×¢×× torbutton.content_sizer.margin_tooltip = ×פ××¤× Tor ××ס××£ ש×× ×× ××× ××פ×× ×ת ××××× ××ר××× ×©× ×××× × ×××××××× ×¤××ת, ×××× ××פ××ת ×ת ×××××ת ×©× ×× ×©×× ×עק×× ××ר×× ××××¤× ×ק×××. torbutton.panel.tooltip.disabled = ×××¥ ××× ××פשר ×ת Tor ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 2c386a718d40932e35bf5d2b7f1fd3f7ad26e8db Author: Translation commit botDate: Sat May 26 16:17:23 2018 + Update translations for torbutton-torbuttondtd --- he/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/torbutton.dtd b/he/torbutton.dtd index d0b535218..5035258c5 100644 --- a/he/torbutton.dtd +++ b/he/torbutton.dtd @@ -47,5 +47,5 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
commit 58e3d32e3aaeae0ded7a3f5ce140813e7653b6ca Author: Translation commit botDate: Sat May 26 16:17:27 2018 + Update translations for torbutton-torbuttondtd_completed --- he/torbutton.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/he/torbutton.dtd b/he/torbutton.dtd index 28ad7d34f..5035258c5 100644 --- a/he/torbutton.dtd +++ b/he/torbutton.dtd @@ -47,4 +47,5 @@ - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed
commit dee385b2467245b06b1b3d78e86c5a16cbf91d47 Author: Translation commit botDate: Sat May 26 16:17:18 2018 + Update translations for torbutton-torbuttonproperties_completed --- he/torbutton.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/he/torbutton.properties b/he/torbutton.properties index 487b909f9..cc5068aca 100644 --- a/he/torbutton.properties +++ b/he/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = ×פ××¤× ×× torbutton.circuit_display.relay = ××סר torbutton.circuit_display.tor_bridge = ×שר torbutton.circuit_display.unknown_country = ×××× × ×× ××××¢× +torbutton.circuit_display.guard = ×ִש××ָר +torbutton.circuit_display.guard_note = צ××ת [Guard] ש×× ×¢×©×× ×× ×××©×ª× ×ת. +torbutton.circuit_display.learn_more = ××× ×¢×× torbutton.content_sizer.margin_tooltip = ×פ××¤× Tor ××ס××£ ש×× ×× ××× ××פ×× ×ת ××××× ××ר××× ×©× ×××× × ×××××××× ×¤××ת, ×××× ××פ××ת ×ת ×××××ת ×©× ×× ×©×× ×עק×× ××ר×× ××××¤× ×ק×××. torbutton.panel.tooltip.disabled = ×××¥ ××× ××פשר ×ת Tor torbutton.panel.tooltip.enabled = ×××¥ ××× ××ש××ת ×ת Tor ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit e211f95d379b6ecc9b8a7b08a013809c6f52b0fb Author: Translation commit botDate: Sat May 26 16:15:30 2018 + Update translations for https_everywhere --- he/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index a468e57ac..dc6a9975b 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -23,7 +23,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit 57b45f32ca0a7207ae54e8627cbcd9fff9b63ff6 Author: Translation commit botDate: Sat May 26 16:15:40 2018 + Update translations for https_everywhere_completed --- he/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index c226eb6ac..dc6a9975b 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -23,6 +23,7 @@ + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits