tor-commits March 2013

tor-commits@lists.torproject.org

21 participants
1373 discussions

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Mar '13

24 Mar '13

commit a4abf459dbff50b38ab354ef0edd4fa48d52fade Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 24 01:45:09 2013 +0000 Update translations for gettor --- sv/gettor.po | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sv/gettor.po b/sv/gettor.po index f3982bf..4afac5b 100644 --- a/sv/gettor.po +++ b/sv/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-02-02 21:10+0000\n" +"PO-Revision-Date: 2013-03-24 01:44+0000\n" "Last-Translator: Dan West <acc(a)dnw.st>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "" +msgstr "Tyvärr kommer vi inte svara dig på den här adressen. Du borde skapa\nett konto med GMAIL.COM, YAHOO.COM eller YAHOO.CN och skicka ett mail från\nnån av dom." #: lib/gettor/i18n.py:35 msgid "" @@ -77,13 +77,13 @@ msgstr "" msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "" +msgstr "Var vänlig svara på detta email, och skriv ett enda paketnamn någonstans\ni kroppen på ditt email." #: lib/gettor/i18n.py:64 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "" +msgstr "TAR EMOT LOKALISERADE VERSIONER AV TOR\n===================================" #: lib/gettor/i18n.py:67 msgid "" @@ -91,14 +91,14 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "" +msgstr "För att få en version av Tor översatt till ditt språk, specificera\nspråket du vill ha i adressen du skickar mailet till:\n\ngettor+fa@torproject.org" #: lib/gettor/i18n.py:72 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "" +msgstr "Detta exempel kommer ge dig det begärda paketet i en lokaliserad\nversion för Farsi (Persiska). Kolla nedan för en lista med stödda språk\nkoder." #: lib/gettor/i18n.py:76 msgid " List of supported locales:" @@ -131,14 +131,14 @@ msgstr "Om du inte väljer nåt språk kommer du få den engelska versionen." msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "MINDRE PAKETSTORLEKAR\n======================" #: lib/gettor/i18n.py:97 msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "" +msgstr "Om din bandvidd är låg eller din internetleverantör inte tillåter dig att\nta emot stora bifogade filer i din email så kan GetTor skicka dig flera\nsmå paket istället för en stor." #: lib/gettor/i18n.py:101 msgid "" @@ -147,7 +147,7 @@ msgid "" " \n" " windows\n" " split" -msgstr "" +msgstr "Inkludera bara order 'split' i en ny linje för sig själv (denna del\när viktig!) så här:\n\nwindows\nsplit" #: lib/gettor/i18n.py:107 msgid "" @@ -200,7 +200,7 @@ msgstr "6.) Det är allt. Du är klar. Tack för att du använder Tor och ha kul msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "SUPPORT\n=======" #: lib/gettor/i18n.py:138 msgid "" @@ -216,7 +216,7 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr "" +msgstr "VERIFIERA SIGNATUR\n================\nOm din dator har GnuPG installerad, använd gpg kommandolinje\nverktyget som följer efter att du packat upp zip filen:\n\n gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:148 msgid "" @@ -237,7 +237,7 @@ msgstr "" msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "" +msgstr "BLOCKERAD TILLGÅNG / CENSUR\n===========================" #: lib/gettor/i18n.py:160 msgid "" @@ -247,7 +247,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "" +msgstr "Om din internet anslutning blockerar tillgång till Tor nätverket kan\ndu behöva en brorelä. Broreläer (eller \"broar\")\när Tor reläer som inte är listade i huvudkatalogen. Eftersom det\ninte finns någon komplett publik lista med den så är det så att även\nom din ISP filtererar anslutningar till alla kända Tor reläer kommer dom\ntroligen inte kunna blockera alla broar." #: lib/gettor/i18n.py:167 msgid "" @@ -261,7 +261,7 @@ msgstr "" msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "" +msgstr "Det är också möjligt att hämta broar med en webbläsare på följande sida:\nhttps://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid "" @@ -277,13 +277,13 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "" +msgstr "VIKTIGT:\nEftersom detta är en del av en uppdelad-fil begäran måste du vänta på\natt alla uppdelade filer är emottagna av dig innan du kan spara dem alla\ni samma katalog och packa upp dom genom att dubbel-klicka på\nförsta filen." #: lib/gettor/i18n.py:185 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "" +msgstr "Paket kan komma fram i fel ordning! Se till att du tagit emot\nalla paket innan du försöker packa upp dom!" #: lib/gettor/i18n.py:188 #, python-format @@ -302,7 +302,7 @@ msgstr "" msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "" +msgstr "Tyvärr har vi problem för tillfället och kan inte uppfylla\ndin begäran just nu. Var tålmodig medan vi löser problemet." #: lib/gettor/i18n.py:197 msgid "" @@ -310,13 +310,13 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "" +msgstr "Tyvärr finns det inga uppdelade paket tillgängliga för paketet du\nbegärde. Var snäll och skicka oss ett annat paketnamn eller begär samma paket\nigen, men ta bort det \"uppdelade\" ordet. I det fallet skickar vi dig hela\npaketet. Se till att det är vad du vill." #: lib/gettor/i18n.py:202 msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "PACKAR UPP FILERNA\n===================" #: lib/gettor/i18n.py:205 msgid "" @@ -353,7 +353,7 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "" +msgstr "windows:\nTor Browser Bundle paketet för Windows operativsystem. Om du kör\nnågon version av Windows, t.ex. Windows XP, Windows Visa eller\nWindows 7, så är det här paketet du ska ha." #: lib/gettor/i18n.py:227 msgid "" @@ -470,7 +470,7 @@ msgstr "" #: lib/gettor/i18n.py:292 msgid "What package should I request?" -msgstr "" +msgstr "Vilket paket bör jag begära?" #: lib/gettor/i18n.py:294 msgid "" @@ -486,11 +486,11 @@ msgstr "" #: lib/gettor/i18n.py:301 msgid "QUESTION:" -msgstr "" +msgstr "FRÅGA:" #: lib/gettor/i18n.py:303 msgid "ANSWER:" -msgstr "" +msgstr "SVAR:" #: lib/gettor/i18n.py:305 #, python-format

1 0

[stem/master] Presently no quoted GETCONF responses exist
by atagar＠torproject.org 23 Mar '13

23 Mar '13

commit ea060119690650b4997c5f4c25f036b3ddeda3ac Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 23 16:24:47 2013 -0700 Presently no quoted GETCONF responses exist As per ticket #6172 the GETCONF response currently returns each result on a separate line, so quotes are unnecessary. If tor does add quoted values then we'll need to see at that time how it should be handled. --- stem/response/getconf.py | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/stem/response/getconf.py b/stem/response/getconf.py index 9cebce9..dc44440 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -43,13 +43,8 @@ class GetConfResponse(stem.response.ControlMessage): while remaining_lines: line = remaining_lines.pop(0) - if line.is_next_mapping(quoted = False): + if line.is_next_mapping(): key, value = line.split("=", 1) - elif line.is_next_mapping(quoted = True): - # TODO: doesn't seem to occur yet in practice... - # https://trac.torproject.org/6172 - - key, value = line.pop_mapping(True).items()[0] else: key, value = (line.pop(), None)

1 0

[stem/master] Dropping python 2.5 compatibility hacks
by atagar＠torproject.org 23 Mar '13

23 Mar '13

commit b3c00c4a6d0565939745e6eba2064b17aaff491a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 23 15:55:13 2013 -0700 Dropping python 2.5 compatibility hacks As discussed on tor-dev@ there's a lot of arguments against maintaining support for python 2.5 and precious few for... https://lists.torproject.org/pipermail/tor-dev/2013-March/004551.html Dropping all the hacks we adopted to support it. --- stem/connection.py | 2 - stem/control.py | 15 ++---- stem/descriptor/reader.py | 19 ++----- stem/process.py | 2 - stem/response/__init__.py | 2 - stem/socket.py | 1 - stem/util/conf.py | 3 - stem/util/enum.py | 8 +-- stem/util/log.py | 2 +- test/integ/connection/authentication.py | 2 - test/integ/control/base_controller.py | 2 - test/integ/control/controller.py | 2 - test/integ/descriptor/extrainfo_descriptor.py | 2 - test/integ/descriptor/microdescriptor.py | 2 - test/integ/descriptor/networkstatus.py | 2 - test/integ/descriptor/reader.py | 6 +- test/integ/descriptor/server_descriptor.py | 2 - test/integ/response/protocolinfo.py | 2 - test/integ/socket/control_message.py | 2 - test/integ/socket/control_socket.py | 2 - test/integ/util/proc.py | 2 - test/mocking.py | 58 --------------------- test/runner.py | 2 - test/static_checks.py | 16 ------ test/unit/descriptor/networkstatus/document_v3.py | 14 ++--- test/unit/descriptor/server_descriptor.py | 4 +- test/unit/tutorial.py | 5 +- 27 files changed, 26 insertions(+), 155 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 4f63378..d1aa3e5 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -102,8 +102,6 @@ fine-grained control over the authentication process. For instance... ============== =========== """ -from __future__ import with_statement - import binascii import getpass import os diff --git a/stem/control.py b/stem/control.py index 02072d0..82cff41 100644 --- a/stem/control.py +++ b/stem/control.py @@ -134,8 +134,6 @@ providing its own for interacting at a higher level. ===================== =========== """ -from __future__ import with_statement - import io import os import Queue @@ -220,10 +218,6 @@ CACHEABLE_GETINFO_PARAMS = ( # is unavailable GEOIP_FAILURE_THRESHOLD = 5 -# TODO: The Thread's isAlive() method and threading's currentThread() was -# changed to the more conventional is_alive() and current_thread() in python -# 2.6 and above. We should use that when dropping python 2.5 compatibility. - class BaseController(object): """ @@ -495,7 +489,7 @@ class BaseController(object): # joins on our threads if it's safe to do so for t in (self._reader_thread, self._event_thread): - if t and t.isAlive() and threading.currentThread() != t: + if t and t.is_alive() and threading.current_thread() != t: t.join() self._notify_status_listeners(State.CLOSED) @@ -516,7 +510,6 @@ class BaseController(object): # Any changes to our is_alive() state happen under the send lock, so we # need to have it to ensure it doesn't change beneath us. - # TODO: when we drop python 2.5 compatibility we can simplify this with self._socket._get_send_lock(): with self._status_listeners_lock: # States imply that our socket is either alive or not, which may not @@ -559,12 +552,12 @@ class BaseController(object): # single thread, which would cause an unexpected exception. Best be safe. with self._socket._get_send_lock(): - if not self._reader_thread or not self._reader_thread.isAlive(): + if not self._reader_thread or not self._reader_thread.is_alive(): self._reader_thread = threading.Thread(target = self._reader_loop, name = "Tor Listener") self._reader_thread.setDaemon(True) self._reader_thread.start() - if not self._event_thread or not self._event_thread.isAlive(): + if not self._event_thread or not self._event_thread.is_alive(): self._event_thread = threading.Thread(target = self._event_loop, name = "Event Notifier") self._event_thread.setDaemon(True) self._event_thread.start() @@ -1184,7 +1177,7 @@ class Controller(BaseController): try: # TODO: We should iterate over the descriptors as they're read from the - # socket rather than reading the whole thing into memeory. + # socket rather than reading the whole thing into memory. # # https://trac.torproject.org/8248 diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 01a2a3b..023777a 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -77,8 +77,6 @@ and picks up where it left off if ran again... +- FileMissing - File does not exist """ -from __future__ import with_statement - import mimetypes import os import Queue @@ -91,11 +89,6 @@ import stem.prereq # flag to indicate when the reader thread is out of descriptor files to read FINISHED = "DONE" -# TODO: The threading.Event's isSet() method was changed to the more -# conventional is_set() in python 2.6 and above. We should use that when -# dropping python 2.5 compatibility... -# http://docs.python.org/library/threading.html#threading.Event.is_set - class FileSkipped(Exception): "Base error when we can't provide descriptor data from a file." @@ -417,7 +410,7 @@ class DescriptorReader(object): new_processed_files = {} remaining_files = list(self._targets) - while remaining_files and not self._is_stopped.isSet(): + while remaining_files and not self._is_stopped.is_set(): target = remaining_files.pop(0) if not os.path.exists(target): @@ -436,14 +429,14 @@ class DescriptorReader(object): self._processed_files = new_processed_files - if not self._is_stopped.isSet(): + if not self._is_stopped.is_set(): self._unreturned_descriptors.put(FINISHED) self._iter_notice.set() def __iter__(self): with self._iter_lock: - while not self._is_stopped.isSet(): + while not self._is_stopped.is_set(): try: descriptor = self._unreturned_descriptors.get_nowait() @@ -461,7 +454,7 @@ class DescriptorReader(object): self._handle_file(os.path.join(root, filename), new_processed_files) # this can take a while if, say, we're including the root directory - if self._is_stopped.isSet(): + if self._is_stopped.is_set(): return def _handle_file(self, target, new_processed_files): @@ -521,7 +514,7 @@ class DescriptorReader(object): with open(target, 'rb') as target_file: for desc in stem.descriptor.parse_file(target_file, validate = self._validate, document_handler = self._document_handler): - if self._is_stopped.isSet(): + if self._is_stopped.is_set(): return self._unreturned_descriptors.put(desc) @@ -550,7 +543,7 @@ class DescriptorReader(object): try: for desc in stem.descriptor.parse_file(entry, validate = self._validate, document_handler = self._document_handler): - if self._is_stopped.isSet(): + if self._is_stopped.is_set(): return desc._set_path(os.path.abspath(target)) diff --git a/stem/process.py b/stem/process.py index e848140..45a064a 100644 --- a/stem/process.py +++ b/stem/process.py @@ -18,8 +18,6 @@ Helper functions for working with tor as a process. launch_tor_with_config - starts a tor process with a custom torrc """ -from __future__ import with_statement - import os import re import signal diff --git a/stem/response/__init__.py b/stem/response/__init__.py index c59c9bd..1f2957a 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -30,8 +30,6 @@ Parses replies from the control socket. SingleLineResponse - Simple tor response only including a single line of information. """ -from __future__ import with_statement - __all__ = [ "events", "getinfo", diff --git a/stem/socket.py b/stem/socket.py index d459fb7..0cd4b0d 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -32,7 +32,6 @@ as instances of the :class:`~stem.response.ControlMessage` class. send_formatting - Performs the formatting expected from sent messages. """ -from __future__ import with_statement from __future__ import absolute_import import re diff --git a/stem/util/conf.py b/stem/util/conf.py index 795cd82..eaad09b 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -157,8 +157,6 @@ Here's an expanation of what happened... +- get_value - provides the value for a given key as a string """ -from __future__ import with_statement - import threading from stem.util import log @@ -478,7 +476,6 @@ class Config(object): elif not self._path: raise ValueError("Unable to save configuration: no path provided") - # TODO: when we drop python 2.5 compatibility we can simplify this with self._contents_lock: with open(self._path, 'w') as output_file: for entry_key in sorted(self.keys()): diff --git a/stem/util/enum.py b/stem/util/enum.py index b39f675..917cca1 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -124,9 +124,7 @@ class Enum(object): if not value in self._values: raise ValueError("No such enumeration exists: %s (options: %s)" % (value, ", ".join(self._values))) - # TODO: python 2.5 lacks an index method on tuples, when we drop support - # we can drop this hack - next_index = (list(self._values).index(value) + 1) % len(self._values) + next_index = (self._values.index(value) + 1) % len(self._values) return self._values[next_index] def previous(self, value): @@ -143,9 +141,7 @@ class Enum(object): if not value in self._values: raise ValueError("No such enumeration exists: %s (options: %s)" % (value, ", ".join(self._values))) - # TODO: python 2.5 lacks an index method on tuples, when we drop support - # we can drop this hack - prev_index = (list(self._values).index(value) - 1) % len(self._values) + prev_index = (self._values.index(value) - 1) % len(self._values) return self._values[prev_index] def __getitem__(self, item): diff --git a/stem/util/log.py b/stem/util/log.py index 5dc54be..498c489 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -195,7 +195,7 @@ class LogBuffer(logging.Handler): """ def __init__(self, runlevel): - # TODO: At least in python 2.5 logging.Handler has a bug in that it doesn't + # 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.5 # support we should switch back to using super() instead. #super(LogBuffer, self).__init__(level = logging_level(runlevel)) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 36b8af6..438fca7 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -3,8 +3,6 @@ Integration tests for authenticating to the control socket via stem.connection.authenticate* functions. """ -from __future__ import with_statement - import os import unittest diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 9b275e4..b91dd24 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -2,8 +2,6 @@ Integration tests for the stem.control.BaseController class. """ -from __future__ import with_statement - import re import threading import time diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 804565a..3255fb3 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -2,8 +2,6 @@ Integration tests for the stem.control.Controller class. """ -from __future__ import with_statement - import shutil import socket import tempfile diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index ab47a2b..35faec9 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -2,8 +2,6 @@ Integration tests for stem.descriptor.extrainfo_descriptor. """ -from __future__ import with_statement - import datetime import os import unittest diff --git a/test/integ/descriptor/microdescriptor.py b/test/integ/descriptor/microdescriptor.py index da9cedd..65e47e3 100644 --- a/test/integ/descriptor/microdescriptor.py +++ b/test/integ/descriptor/microdescriptor.py @@ -2,8 +2,6 @@ Integration tests for stem.descriptor.microdescriptor. """ -from __future__ import with_statement - import os import unittest diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index 31378fa..92a1973 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -2,8 +2,6 @@ Integration tests for stem.descriptor.networkstatus. """ -from __future__ import with_statement - import datetime import os import unittest diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 39170a0..f0fa7d2 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -2,8 +2,6 @@ Integration tests for stem.descriptor.reader. """ -from __future__ import with_statement - import getpass import os import signal @@ -56,7 +54,9 @@ def _get_raw_tar_descriptors(): test_path = os.path.join(DESCRIPTOR_TEST_DATA, "descriptor_archive.tar") raw_descriptors = [] - # TODO: revert to using the 'with' keyword for this when dropping python 2.5 support + # TODO: revert to using the 'with' keyword for this when dropping python + # 2.6 support + tar_file = None try: diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 696634a..43c9d4d 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -2,8 +2,6 @@ Integration tests for stem.descriptor.server_descriptor. """ -from __future__ import with_statement - import datetime import os import unittest diff --git a/test/integ/response/protocolinfo.py b/test/integ/response/protocolinfo.py index fa9e265..b7ef46a 100644 --- a/test/integ/response/protocolinfo.py +++ b/test/integ/response/protocolinfo.py @@ -3,8 +3,6 @@ Integration tests for the stem.response.protocolinfo.ProtocolInfoResponse class and related functions. """ -from __future__ import with_statement - import unittest import stem.connection diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index 557e70d..607d2a4 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -2,8 +2,6 @@ Integration tests for the stem.response.ControlMessage class. """ -from __future__ import with_statement - import re import unittest diff --git a/test/integ/socket/control_socket.py b/test/integ/socket/control_socket.py index 2f951b2..a716eea 100644 --- a/test/integ/socket/control_socket.py +++ b/test/integ/socket/control_socket.py @@ -8,8 +8,6 @@ those focus on parsing and correctness of the content these are more concerned with the behavior of the socket itself. """ -from __future__ import with_statement - import unittest import stem.connection diff --git a/test/integ/util/proc.py b/test/integ/util/proc.py index e6d1534..4fabfe9 100644 --- a/test/integ/util/proc.py +++ b/test/integ/util/proc.py @@ -3,8 +3,6 @@ Integration tests for stem.util.proc functions against the tor process that we're running. """ -from __future__ import with_statement - import os import unittest diff --git a/test/mocking.py b/test/mocking.py index b491010..340a625 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -58,7 +58,6 @@ import base64 import hashlib import inspect import itertools -import StringIO import stem.descriptor.extrainfo_descriptor import stem.descriptor.microdescriptor @@ -1059,60 +1058,3 @@ def sign_descriptor_content(desc_content): desc_content = desc_content[:rst_start] + router_signature_token + router_signature_start + signature_base64 + router_signature_end return desc_content - - -class BytesBuffer(object): - """ - Similiar to a StringIO but provides bytes content (in python 3.x StringIO can - only be used for unicode). - """ - - def __init__(self, content): - self.wrapped_file = StringIO.StringIO(stem.util.str_tools._to_unicode(content)) - - def close(self): - return self.wrapped_file.close() - - def getvalue(self): - return self.wrapped_file.getvalue() - - def isatty(self): - return self.wrapped_file.isatty() - - def next(self): - return self.wrapped_file.next() - - def read(self, n = -1): - return stem.util.str_tools._to_bytes(self.wrapped_file.read(n)) - - def readline(self): - return stem.util.str_tools._to_bytes(self.wrapped_file.readline()) - - def readlines(self, sizehint = None): - # being careful to do in-place conversion so we don't accidently double our - # memory usage - - if sizehint is not None: - results = self.wrapped_file.readlines(sizehint) - else: - results = self.wrapped_file.readlines() - - for i in xrange(len(results)): - results[i] = stem.util.str_tools._to_bytes(results[i]) - - return results - - def seek(self, pos, mode = None): - if mode is not None: - return self.wrapped_file.seek(pos, mode) - else: - return self.wrapped_file.seek(pos) - - def tell(self): - return self.wrapped_file.tell() - - def __enter__(self): - return self - - def __exit__(self, exit_type, value, traceback): - pass diff --git a/test/runner.py b/test/runner.py index f94e4da..7fa9c41 100644 --- a/test/runner.py +++ b/test/runner.py @@ -39,8 +39,6 @@ about the tor test instance they're running against. +- get_tor_command - provides the command used to start tor """ -from __future__ import with_statement - import logging import os import shutil diff --git a/test/static_checks.py b/test/static_checks.py index 43b6866..b8cc664 100644 --- a/test/static_checks.py +++ b/test/static_checks.py @@ -8,16 +8,8 @@ which are... * two space indentations * tabs are the root of all evil and should be shot on sight * standard newlines (\\n), not windows (\\r\\n) nor classic mac (\\r) - -This also checks for 2.5 compatibility issues (yea, they're not whitespace but -it's so much easier to do here...): - -* checks that anything using the 'with' keyword has... - from __future__ import with_statement """ -from __future__ import with_statement - import re import os @@ -166,7 +158,6 @@ def get_issues(base_path = DEFAULT_TARGET): file_contents = f.read() lines, file_issues, prev_indent = file_contents.split("\n"), [], 0 - has_with_import, given_with_warning = False, False is_block_comment = False for index, line in enumerate(lines): @@ -175,13 +166,6 @@ def get_issues(base_path = DEFAULT_TARGET): if '"""' in content: is_block_comment = not is_block_comment - if content == "from __future__ import with_statement": - has_with_import = True - elif content.startswith("with ") and content.endswith(":") \ - and not has_with_import and not given_with_warning and not is_block_comment: - file_issues.append((index + 1, "missing 'with' import (from __future__ import with_statement)")) - given_with_warning = True - if "\t" in whitespace: file_issues.append((index + 1, "indentation has a tab")) elif "\r" in content: diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index c140d23..f4b13af 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -2,9 +2,8 @@ Unit tests for the NetworkStatusDocumentV3 of stem.descriptor.networkstatus. """ -from __future__ import with_statement - import datetime +import io import unittest import stem.descriptor @@ -28,7 +27,6 @@ from test.mocking import get_router_status_entry_v3, \ get_router_status_entry_micro_v3, \ get_directory_authority, \ get_network_status_document_v3, \ - BytesBuffer, \ CRYPTO_BLOB, \ DOC_SIG, \ NETWORK_STATUS_DOCUMENT_FOOTER @@ -118,7 +116,7 @@ class TestNetworkStatusDocument(unittest.TestCase): # first example: parsing via the NetworkStatusDocumentV3 constructor - consensus_file = BytesBuffer(content) + consensus_file = io.BytesIO(content) consensus = NetworkStatusDocumentV3(consensus_file.read()) consensus_file.close() @@ -127,7 +125,7 @@ class TestNetworkStatusDocument(unittest.TestCase): # second example: using stem.descriptor.parse_file - with BytesBuffer(content) as consensus_file: + with io.BytesIO(content) as consensus_file: for router in stem.descriptor.parse_file(consensus_file, 'network-status-consensus-3 1.0'): self.assertEqual('caerSidi', router.nickname) @@ -144,12 +142,12 @@ class TestNetworkStatusDocument(unittest.TestCase): entry2 = get_router_status_entry_v3({'s': "Valid"}) content = get_network_status_document_v3(routers = (entry1, entry2), content = True) - descriptors = list(stem.descriptor.parse_file(BytesBuffer(content), 'network-status-consensus-3 1.0', document_handler = stem.descriptor.DocumentHandler.DOCUMENT)) + descriptors = list(stem.descriptor.parse_file(io.BytesIO(content), 'network-status-consensus-3 1.0', document_handler = stem.descriptor.DocumentHandler.DOCUMENT)) self.assertEqual(1, len(descriptors)) self.assertTrue(isinstance(descriptors[0], NetworkStatusDocumentV3)) self.assertEqual(2, len(descriptors[0].routers)) - descriptors = list(stem.descriptor.parse_file(BytesBuffer(content), 'network-status-consensus-3 1.0', document_handler = stem.descriptor.DocumentHandler.BARE_DOCUMENT)) + descriptors = list(stem.descriptor.parse_file(io.BytesIO(content), 'network-status-consensus-3 1.0', document_handler = stem.descriptor.DocumentHandler.BARE_DOCUMENT)) self.assertEqual(1, len(descriptors)) self.assertTrue(isinstance(descriptors[0], NetworkStatusDocumentV3)) self.assertEqual(0, len(descriptors[0].routers)) @@ -168,7 +166,7 @@ class TestNetworkStatusDocument(unittest.TestCase): expected_document = get_network_status_document_v3() - descriptor_file = BytesBuffer(content) + descriptor_file = io.BytesIO(content) entries = list(_parse_file(descriptor_file)) self.assertEquals(entry1, entries[0]) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index e8fe6c0..02ec64c 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -3,6 +3,7 @@ Unit tests for stem.descriptor.server_descriptor. """ import datetime +import io import unittest import stem.descriptor.server_descriptor @@ -17,7 +18,6 @@ from test.mocking import no_op, \ revert_mocking, \ get_relay_server_descriptor, \ get_bridge_server_descriptor, \ - BytesBuffer, \ CRYPTO_BLOB @@ -216,7 +216,7 @@ class TestServerDescriptor(unittest.TestCase): desc_text += b"\ntrailing text that should be ignored, ho hum" # running _parse_file should provide an iterator with a single descriptor - desc_iter = stem.descriptor.server_descriptor._parse_file(BytesBuffer(stem.util.str_tools._to_unicode(desc_text))) + desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text)) desc_entries = list(desc_iter) self.assertEquals(1, len(desc_entries)) desc = desc_entries[0] diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 4ec6290..405bca7 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -2,8 +2,7 @@ Tests for the examples given in stem's tutorial. """ -from __future__ import with_statement - +import io import StringIO import sys import unittest @@ -98,7 +97,7 @@ class TestTutorial(unittest.TestCase): for desc in parse_file(open("/home/atagar/.tor/cached-consensus")): print "found relay %s (%s)" % (desc.nickname, desc.fingerprint) - test_file = mocking.BytesBuffer(mocking.get_network_status_document_v3( + test_file = io.BytesIO(mocking.get_network_status_document_v3( routers = [mocking.get_router_status_entry_v3()], content = True, ))

1 0

[tor/master] Avoid clang warnings from implicit off_t->size_t cast
by nickm＠torproject.org 23 Mar '13

23 Mar '13

commit 8b6a952c94bbc7bd3a9dc3356e708654092e08af Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 23 18:50:21 2013 -0400 Avoid clang warnings from implicit off_t->size_t cast --- src/common/crypto_curve25519.c | 2 +- src/test/test_crypto.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 3e4004d..88c723f 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -169,7 +169,7 @@ curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out, end: if (content) { - memwipe(content, 0, st.st_size); + memwipe(content, 0, (size_t) st.st_size); tor_free(content); } if (r != 0) { diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index c531c60..fcaa081 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1097,7 +1097,7 @@ test_crypto_curve25519_persist(void *arg) tor_free(tag); content[69] ^= 0xff; - tt_int_op(0, ==, write_bytes_to_file(fname, content, st.st_size, 1)); + tt_int_op(0, ==, write_bytes_to_file(fname, content, (size_t)st.st_size, 1)); tt_int_op(-1, ==, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); done:

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 23 Mar '13

23 Mar '13

commit 80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf Merge: 9a6514c 8b6a952 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 23 18:51:15 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/common/crypto_curve25519.c | 2 +- src/test/test_crypto.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Avoid clang warnings from implicit off_t->size_t cast
by nickm＠torproject.org 23 Mar '13

23 Mar '13

1 0

[stem/master] Changing isinstance() checks to look for both bytes and unicode
by atagar＠torproject.org 23 Mar '13

23 Mar '13

commit 88c3b1a6ae4152f1724fcc7267b7a5b69aae5a74 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 23 15:06:08 2013 -0700 Changing isinstance() checks to look for both bytes and unicode Commit b12e9c0 broke a couple of our integration tests because it caused us to call controller methods with unicode rather than str arguments... https://trac.torproject.org/8576 This should be fine - python 2.x can usually use bytes and unicode inputs interchangeably. The problem was that we routinely use isinstance() checks to see if an input is a string and, if it isn't, assume it's a collection. As a result we were calling... GETINFO m d / n a m e / f o o ... rather than... GETINFO md/name/foo Tor in turn errored saying that those single character getinfo options didn't exist. To fix this I'm changing most of our isinstance() checks to look for both bytes and unicode. --- stem/control.py | 10 +++++----- stem/descriptor/__init__.py | 2 +- stem/descriptor/reader.py | 2 +- stem/exit_policy.py | 6 +++--- stem/response/events.py | 2 +- stem/util/connection.py | 4 ++-- stem/util/enum.py | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4d91ecd..02072d0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -737,7 +737,7 @@ class Controller(BaseController): start_time = time.time() reply = {} - if isinstance(params, str): + if isinstance(params, (bytes, unicode)): is_multiple = False params = set([params]) else: @@ -1299,7 +1299,7 @@ class Controller(BaseController): start_time = time.time() reply = {} - if isinstance(params, str): + if isinstance(params, (bytes, unicode)): params = [params] # remove strings which contain only whitespace @@ -1483,7 +1483,7 @@ class Controller(BaseController): if value is None: if cache_key in self._request_cache: del self._request_cache[cache_key] - elif isinstance(value, str): + elif isinstance(value, (bytes, unicode)): self._request_cache[cache_key] = [value] else: self._request_cache[cache_key] = value @@ -1697,7 +1697,7 @@ class Controller(BaseController): * :class:`stem.InvalidArguments` if features passed were invalid """ - if isinstance(features, str): + if isinstance(features, (bytes, unicode)): features = [features] response = self.msg("USEFEATURE %s" % " ".join(features)) @@ -1848,7 +1848,7 @@ class Controller(BaseController): args = [circuit_id] - if isinstance(path, str): + if isinstance(path, (bytes, unicode)): path = [path] if path: diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 04ee7dc..501ac5d 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -365,7 +365,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi content = None if skip else [] ending_keyword = None - if isinstance(keywords, str): + if isinstance(keywords, (bytes, unicode)): keywords = (keywords,) if ignore_first: diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 4fb6ff4..01a2a3b 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -263,7 +263,7 @@ class DescriptorReader(object): """ def __init__(self, target, validate = True, follow_links = False, buffer_size = 100, persistence_path = None, document_handler = stem.descriptor.DocumentHandler.ENTRIES): - if isinstance(target, str): + if isinstance(target, (bytes, unicode)): self._targets = [target] else: self._targets = target diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 48dc28a..d187d62 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -108,7 +108,7 @@ def get_config_policy(rules): :raises: **ValueError** if input isn't a valid tor exit policy """ - if isinstance(rules, (str, unicode)): + if isinstance(rules, (bytes, unicode)): rules = rules.split(',') result = [] @@ -147,7 +147,7 @@ class ExitPolicy(object): def __init__(self, *rules): # sanity check the types for rule in rules: - if not isinstance(rule, (str, unicode, ExitPolicyRule)): + if not isinstance(rule, (bytes, unicode, ExitPolicyRule)): raise TypeError("Exit policy rules can only contain strings or ExitPolicyRules, got a %s (%s)" % (type(rule), rules)) self._rules = None # lazily loaded series of ExitPolicyRule @@ -304,7 +304,7 @@ class ExitPolicy(object): is_all_accept, is_all_reject = True, True for rule in self._input_rules: - if isinstance(rule, (str, unicode)): + if isinstance(rule, (bytes, unicode)): rule = ExitPolicyRule(rule.strip()) if rule.is_accept: diff --git a/stem/response/events.py b/stem/response/events.py index 4c44e48..7ae4854 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -142,7 +142,7 @@ class Event(stem.response.ControlMessage): attr_values = getattr(self, attr) if attr_values: - if isinstance(attr_values, str): + if isinstance(attr_values, (bytes, unicode)): attr_values = [attr_values] for value in attr_values: diff --git a/stem/util/connection.py b/stem/util/connection.py index b1a292d..fd0ac6e 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -37,7 +37,7 @@ def is_valid_ipv4_address(address): :returns: **True** if input is a valid IPv4 address, **False** otherwise """ - if not isinstance(address, (str, unicode)): + if not isinstance(address, (bytes, unicode)): return False # checks if theres four period separated values @@ -105,7 +105,7 @@ def is_valid_port(entry, allow_zero = False): return False return True - elif isinstance(entry, (str, unicode)): + elif isinstance(entry, (bytes, unicode)): if not entry.isdigit(): return False elif entry[0] == "0" and len(entry) > 1: diff --git a/stem/util/enum.py b/stem/util/enum.py index 504af48..b39f675 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -74,7 +74,7 @@ class Enum(object): keys, values = [], [] for entry in args: - if isinstance(entry, str): + if isinstance(entry, (bytes, unicode)): key, val = entry, stem.util.str_tools._to_camel_case(entry) elif isinstance(entry, tuple) and len(entry) == 2: key, val = entry

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Mar '13

23 Mar '13

commit d37108ebe189cac3b0fedd8611f52734be09fcbb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 21:16:07 2013 +0000 Update translations for liveusb-creator --- ar/ar.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 2d76ebd..4731b07 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-03-23 20:43+0000\n" +"PO-Revision-Date: 2013-03-23 21:08+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -364,11 +364,11 @@ msgstr "" msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "هذا هو شريط التقدم و سوف يشير إلي مدي تقدمك في عملية خلق الايڨ يو أس بي " #: ../liveusb/dialog.py:162 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "هذه هي لوحة مراقبة الحالة و هنا يتم طباعة كل الرسائل." #: ../liveusb/creator.py:908 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Mar '13

23 Mar '13

commit 35642af413b2eddf08f0954cf13a6eb8157f19a2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 20:46:04 2013 +0000 Update translations for liveusb-creator --- ar/ar.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index e7b9fba..2d76ebd 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-03-23 20:10+0000\n" +"PO-Revision-Date: 2013-03-23 20:43+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -470,7 +470,7 @@ msgstr "نظام ملفات غير مدعوم: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "نظام ملفات غير مدعوم: %s" +msgstr "نظام ملفات غير مدعوم: %s\nفي حالة محاولتك تنصيب تحديث لنظام تيلز (و هو لم يتم تثبيتة من قبل هذا المثبت), هذا الخيار غير مدعوم: يجب عليك أن تثبت البرنامج من جديد و يرجح أستخدام امر \"أستنساخ و تثبيت\"" #: ../liveusb/creator.py:1211 #, python-format @@ -481,11 +481,11 @@ msgstr "نظام ملفات غير مدعوم: %s\nالرجاء نسخ قرص US #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" -msgstr "التحديث من ملف أيزو (ISO)" +msgstr "التحديث من ملف أيزو" #: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" -msgstr "أستخدام نظام تشغيل حي بصيغة أيزو (ISO)" +msgstr "أستخدام نظام تشغيل حي بصيغة أيزو" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Mar '13

23 Mar '13

commit a28e7420497e38aabba44191995204913f1cbed0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 23 20:16:10 2013 +0000 Update translations for liveusb-creator --- ar/ar.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 56a9019..e7b9fba 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-03-23 19:45+0000\n" +"PO-Revision-Date: 2013-03-23 20:10+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -470,7 +470,7 @@ msgstr "نظام ملفات غير مدعوم: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "" +msgstr "نظام ملفات غير مدعوم: %s" #: ../liveusb/creator.py:1211 #, python-format

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2013