June 2014 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 01 Jun '14

01 Jun '14

commit ffc4a59e186c8537c4d77019c8f07510ab8ca2e3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 1 08:45:17 2014 +0000 Update translations for liveusb-creator --- uk/uk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uk/uk.po b/uk/uk.po index aff5608..85de7f8 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-29 09:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-01 08:41+0000\n" +"Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -507,7 +507,7 @@ msgstr "Непідтримувана файлова система: %s\nЗроб #: ../liveusb/creator.py:877 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Оновити властивості системного розділу %(system_partition)s" #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO"

1 0

[stem/master] Skipping @type annotations in descriptor parse_file() functions
by atagar＠torproject.org 01 Jun '14

01 Jun '14

commit 01c516df08c192a159ed84a1404ce7771edbf037 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 31 20:34:04 2014 -0700 Skipping @type annotations in descriptor parse_file() functions At a high level stem parses descriptors by doing the following... 1. Users call stem.descriptor.parse_file(). 2. The parse_file() function uses the @type annotation to guess the descriptor type. 3. It delegates to the parse_file() function of the relevant descriptor class. Every descriptor class has its own parse_file() function. Karsten is starting to serve descriptor files which are multiple descriptors concatenated together. Stem actually already pretty much handles this since I designed our parsers to read Tor's cached descriptors (which are concatenated descriptors as well). The only gotcha is that @type annotations technically aren't valid descriptor content so at step #3 the descriptor classes balk saying so. Working around this by simply skipping @type annotations at the beginning of files. --- stem/descriptor/extrainfo_descriptor.py | 3 +++ stem/descriptor/microdescriptor.py | 3 +++ stem/descriptor/networkstatus.py | 3 +++ stem/descriptor/server_descriptor.py | 3 +++ 4 files changed, 12 insertions(+) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 3ccdd27..000b4ec 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -175,6 +175,9 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True, **kwargs): extrainfo_content += _read_until_keywords(block_end_prefix, descriptor_file, True) if extrainfo_content: + if extrainfo_content[0].startswith('@type'): + extrainfo_content = extrainfo_content[1:] + if is_bridge: yield BridgeExtraInfoDescriptor(bytes.join(b'', extrainfo_content), validate, **kwargs) else: diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index f308da4..33ad4e0 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -138,6 +138,9 @@ def _parse_file(descriptor_file, validate = True, **kwargs): descriptor_lines.append(line) if descriptor_lines: + if descriptor_lines[0].startswith('@type'): + descriptor_lines = descriptor_lines[1:] + # strip newlines from annotations annotations = map(bytes.strip, annotations) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 588d4ac..fbe96fb 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -198,6 +198,9 @@ def _parse_file(document_file, document_type = None, validate = True, is_microde header = _read_until_keywords((ROUTERS_START, FOOTER_START, V2_FOOTER_START), document_file) + if header and header[0].startswith('@type'): + header = header[1:] + routers_start = document_file.tell() _read_until_keywords((FOOTER_START, V2_FOOTER_START), document_file, skip = True) routers_end = document_file.tell() diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 58598b2..97781da 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -143,6 +143,9 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True, **kwargs): descriptor_content += _read_until_keywords(block_end_prefix, descriptor_file, True) if descriptor_content: + if descriptor_content[0].startswith('@type'): + descriptor_content = descriptor_content[1:] + # strip newlines from annotations annotations = map(bytes.strip, annotations)

1 0

[stem/master] FAQ entry to discuss how to handle *.tar.xz archives
by atagar＠torproject.org 01 Jun '14

01 Jun '14

commit 68dfff4e3b0226450ff834fd081c6e60d456824e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 31 19:57:57 2014 -0700 FAQ entry to discuss how to handle *.tar.xz archives Short FAQ entry dicussing how to handle metric's new *.tar.xz archives... https://lists.torproject.org/pipermail/tor-dev/2014-May/006884.html --- docs/faq.rst | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index a30601e..123002f 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -16,6 +16,7 @@ Frequently Asked Questions * :ref:`how_do_i_connect_to_tor` * :ref:`how_do_i_request_a_new_identity_from_tor` * :ref:`how_do_i_reload_my_torrc` + * :ref:`how_do_i_read_tar_xz_descriptor_archives` * :ref:`what_is_that_with_keyword_i_keep_seeing_in_the_tutorials` * **Development** @@ -348,7 +349,10 @@ And with Stem... How do I reload my torrc? ------------------------- -Tor is configured through its `torrc <https://www.torproject.org/docs/faq.html.en#torrc>`_. When you edit this file you need to either restart Tor or issue a **HUP** for the changes to be reflected. To issue a HUP you can either... +Tor is configured through its `torrc +<https://www.torproject.org/docs/faq.html.en#torrc>`_. When you edit this file +you need to either restart Tor or issue a **HUP** for the changes to be +reflected. To issue a HUP you can either... * Run **pkill -sighup tor**. * Send Tor a **HUP** signal through its control port... @@ -362,6 +366,23 @@ Tor is configured through its `torrc <https://www.torproject.org/docs/faq.html.e controller.authenticate() controller.signal(Signal.HUP) +.. _how_do_i_read_tar_xz_descriptor_archives: + +How do I read \*.tar.xz descriptor archives? +-------------------------------------------- + +Stem's :func:`~stem.descriptor.__init__.parse_file` and +:class:`~stem.descriptor.reader.DescriptorReader` +can read plaintext descriptors and tarballs. However, `metrics uses *.xz +compression +<https://lists.torproject.org/pipermail/tor-dev/2014-May/006884.html>`_. Python +3.3 adds builtin xz support, but if you're using an earlier version of python +you will need to decompress the archives yourself. + +With modern versions of tar you can simply decompress archives via **tar xf +archive.tar.xz**, or programmatically using `lzma +<https://pypi.python.org/pypi/pyliblzma>`_. + .. _what_is_that_with_keyword_i_keep_seeing_in_the_tutorials: What is that 'with' keyword I keep seeing in the tutorials?

1 0