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

[stem/master] Python 2.5 and OSX compatability fixes
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 4b79530c47abdeebb33bc7c06a6a6bda4e2815b6 Merge: 09acb5e 1c01521 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 24 18:20:59 2012 -0700 Python 2.5 and OSX compatability fixes stem/control.py | 10 ++++-- stem/descriptor/reader.py | 60 ++++++++++++++++++++++++-------------- stem/process.py | 18 ++++++++++- stem/util/system.py | 19 +++++++++++- test/integ/descriptor/reader.py | 9 +++++- test/integ/process.py | 30 +++++++++++++++++-- test/integ/util/system.py | 13 +++++++- test/runner.py | 9 +++++- 8 files changed, 133 insertions(+), 35 deletions(-)

1 0

[stem/master] OSX sucks at terminating processes
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 1c0152185a9ff27a49f6491bcd2ea06f64158820 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 23 14:36:08 2012 -0700 OSX sucks at terminating processes Our os.kill() call evidently doesn't kill tor right away on OSX, causing tests to disrupt each other (port conflicts). --- test/integ/process.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 423b2c3..58440e0 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -51,6 +51,12 @@ class TestProcess(unittest.TestCase): tor_process.kill() elif not stem.util.system.is_windows(): os.kill(tor_process.pid, signal.SIGTERM) + + # On OSX, python 2.5 this kill call doesn't seem to block, causing our + # tor instance to linger and cause a port conflict with the following + # test. Giving it a moment to kill for realz. + + time.sleep(0.5) def test_launch_tor_with_timeout(self): """

1 0

[stem/master] Stopping tor initialization timeout when done
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 54a013552266540d5029af2ff08db2fed1c1dc92 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 24 14:14:49 2012 -0700 Stopping tor initialization timeout when done Ok, I'm kinda surprised that we haven't tripped over this before. We never terminate the tor initialization timeout on either or success or failure, causing us to arbitrarily kill our process after 90 seconds. This bug probably survived so long becuase our integ tests take less time than that to complete, and then spawns a new tor instance resetting the timer again. --- stem/process.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/stem/process.py b/stem/process.py index 337699d..04f787a 100644 --- a/stem/process.py +++ b/stem/process.py @@ -104,6 +104,8 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce # this will provide empty results if the process is terminated if not init_line: + if timeout: signal.alarm(0) # stop alarm + # ... but best make sure if stem.prereq.is_python_26(): tor_process.kill() @@ -120,6 +122,8 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce problem_match = problem_line.search(init_line) if bootstrap_match and int(bootstrap_match.groups()[0]) >= completion_percent: + if timeout: signal.alarm(0) # stop alarm + if temp_file: try: os.remove(temp_file) except: pass

1 0

[stem/master] Remove single letter variable
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 86baf8e562c0486d2ac2e2be893480eb149742b4 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Jun 23 19:16:38 2012 +0530 Remove single letter variable According to the guidelines of our benevolent dictator we must abolish the use of single letter variables. The sole infiltrator has been abolished. Once again, there is peace in the land of stem. --- stem/version.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/version.py b/stem/version.py index cfb2e12..c63a92a 100644 --- a/stem/version.py +++ b/stem/version.py @@ -100,10 +100,10 @@ class Version: def __init__(self, version_str): self.version_str = version_str - m = re.match(r'^([0-9]+)\.([0-9]+)\.([0-9]+)(\.[0-9]+)?(-\S*)?$', version_str) + version_parts = re.match(r'^([0-9]+)\.([0-9]+)\.([0-9]+)(\.[0-9]+)?(-\S*)?$', version_str) - if m: - major, minor, micro, patch, status = m.groups() + if version_parts: + major, minor, micro, patch, status = version_parts.groups() # The patch and status matches are optional (may be None) and have an extra # proceeding period or dash if they exist. Stripping those off.

1 0

[stem/master] Integ test relied on tor being in path
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit cec8ecfcf175af55d9503d45e169cd26f9664279 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 19 09:47:33 2012 -0700 Integ test relied on tor being in path I thought that it was a safe assumption that tor was in our path since the integ tests will only run if it can start tor. However, the tests have a '--tor <path to tor>' argument which means that the tests may be running without our path including the tor binary (or even having the binary called 'tor'). Changing the test to look for 'ls' or 'dir' instead since every platform that I can think of has that. Caught by Karsten. --- stem/util/system.py | 3 +++ test/integ/util/system.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index d6a3ce2..73fd47e 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -74,6 +74,9 @@ def is_available(command, cached=True): than one command is present (for instance "ls -a | grep foo") then this just checks the first. + Note that many builtin common commands (like cd and ulimit) aren't in the + PATH so this lookup will fail for them. + :param str command: command to search for :param bool cached: makes use of available cached results if True diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 6cdf0ec..174357e 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -61,8 +61,11 @@ class TestSystem(unittest.TestCase): Checks the stem.util.system.is_available function. """ - # since we're running tor it would be kinda sad if this didn't detect it - self.assertTrue(stem.util.system.is_available("tor")) + # I have yet to see a platform without 'ls' + if stem.util.system.is_windows(): + self.assertTrue(stem.util.system.is_available("dir")) + else: + self.assertTrue(stem.util.system.is_available("ls")) # but it would be kinda weird if this did... self.assertFalse(stem.util.system.is_available("blarg_and_stuff"))

1 0

[stem/master] Python 2.5 doesn't have is_set() method for Events
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 9a8ac67f57fc203eb20dddea3aa09ba49bfe7a97 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 20 10:35:17 2012 -0700 Python 2.5 doesn't have is_set() method for Events In python 2.5 the threading module used camel case method names. They also accepted the underscore convention (the 'official' style for python) in python 2.6, but until we drop 2.5 compatability we need to use the camel case versions. --- stem/descriptor/reader.py | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 676676f..7a7e565 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -85,6 +85,11 @@ import stem.descriptor # 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 compatability... +# 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." @@ -336,7 +341,7 @@ class DescriptorReader: new_processed_files = {} remaining_files = list(self._targets) - while remaining_files and not self._is_stopped.is_set(): + while remaining_files and not self._is_stopped.isSet(): target = remaining_files.pop(0) if not os.path.exists(target): @@ -355,20 +360,20 @@ class DescriptorReader: 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.is_set(): break + if self._is_stopped.isSet(): break else: self._handle_file(target, new_processed_files) self._processed_files = new_processed_files - if not self._is_stopped.is_set(): + if not self._is_stopped.isSet(): self._unreturned_descriptors.put(FINISHED) self._iter_notice.set() def __iter__(self): with self._iter_lock: - while not self._is_stopped.is_set(): + while not self._is_stopped.isSet(): try: descriptor = self._unreturned_descriptors.get_nowait() @@ -427,7 +432,7 @@ class DescriptorReader: try: with open(target) as target_file: for desc in stem.descriptor.parse_file(target, target_file): - if self._is_stopped.is_set(): return + if self._is_stopped.isSet(): return self._unreturned_descriptors.put(desc) self._iter_notice.set() except TypeError, exc: @@ -445,7 +450,7 @@ class DescriptorReader: entry = tar_file.extractfile(tar_entry) for desc in stem.descriptor.parse_file(target, entry): - if self._is_stopped.is_set(): return + if self._is_stopped.isSet(): return self._unreturned_descriptors.put(desc) self._iter_notice.set()

1 0

[stem/master] Using theading's currrentThead() rather than current_thread()
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 60b0e8ba06a03e5ae1664959c2f9e1552f224b39 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 09:40:00 2012 -0700 Using theading's currrentThead() rather than current_thread() The threading module's current_thead() function isn't availalbe in python 2.5. It isn't documented, but there seems to have been a mass aliasing in 2.6 to the underscore convention so using that instead. --- stem/control.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4e6e4f2..9c5c515 100644 --- a/stem/control.py +++ b/stem/control.py @@ -54,11 +54,9 @@ State = stem.util.enum.Enum("INIT", "RESET", "CLOSED") UNDEFINED = "<Undefined_ >" -# TODO: The Thread's isAlive() method was changed to the more conventional -# is_alive() in python 2.6 and above. We should use that when dropping python -# 2.5 compatability... -# http://docs.python.org/library/threading.html#threading.Thread.is_alive -# http://bugs.python.org/issue15126 +# TODO: The Thread's isAlive() method and theading'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 compatability. class BaseController: """ @@ -288,7 +286,7 @@ class BaseController: # 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.current_thread() != t: + if t and t.isAlive() and threading.currentThread() != t: t.join() self._notify_status_listeners(State.CLOSED, False)

1 0

[stem/master] Python 2.5 doesn't have is_alive() method for Threads
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 1098d9ad35dc0c04dcced034b1e564706c543c96 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 09:31:50 2012 -0700 Python 2.5 doesn't have is_alive() method for Threads Though it's not documented [1], the Thread class' isAlive() method was first aliased to is_alive() in python 2.6. Also filed a ticket for the documentation bug [2]. [1] http://docs.python.org/library/threading.html#threading.Thread.is_alive [2] http://bugs.python.org/issue15126 --- stem/control.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 47b08c9..4e6e4f2 100644 --- a/stem/control.py +++ b/stem/control.py @@ -54,6 +54,12 @@ State = stem.util.enum.Enum("INIT", "RESET", "CLOSED") UNDEFINED = "<Undefined_ >" +# TODO: The Thread's isAlive() method was changed to the more conventional +# is_alive() in python 2.6 and above. We should use that when dropping python +# 2.5 compatability... +# http://docs.python.org/library/threading.html#threading.Thread.is_alive +# http://bugs.python.org/issue15126 + class BaseController: """ Controller for the tor process. This is a minimal base class for other @@ -282,7 +288,7 @@ class BaseController: # joins on our threads if it's safe to do so for t in (self._reader_thread, self._event_thread): - if t and t.is_alive() and threading.current_thread() != t: + if t and t.isAlive() and threading.current_thread() != t: t.join() self._notify_status_listeners(State.CLOSED, False) @@ -338,12 +344,12 @@ class BaseController: # single thread, which would cause an unexpeceted exception. Best be safe. with self._socket._get_send_lock(): - if not self._reader_thread or not self._reader_thread.is_alive(): + if not self._reader_thread or not self._reader_thread.isAlive(): 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.is_alive(): + if not self._event_thread or not self._event_thread.isAlive(): self._event_thread = threading.Thread(target = self._event_loop, name = "Event Notifier") self._event_thread.setDaemon(True) self._event_thread.start()

1 0

[stem/master] Checking for windows newlines
by atagar＠torproject.org 25 Jun '12

25 Jun '12

commit 09acb5e43ba6afd265bcf79e7534dbf369fa227b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 22 09:56:17 2012 -0700 Checking for windows newlines A while back I added windows/old-style-mac newline checking to the whitespace checker, but got distracted before committing. Reviving it from the stash. This should do the trick, but haven't checked it against windows files (guess we'll get confirmation that it works or doesn't when we have one submitted). --- test/check_whitespace.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/test/check_whitespace.py b/test/check_whitespace.py index a567d49..687a8a3 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -4,6 +4,7 @@ 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) * no trailing whitespace unless the line is empty, in which case it should have the same indentation as the surrounding code @@ -39,7 +40,7 @@ def get_issues(base_path = DEFAULT_TARGET): for file_path in _get_python_files(base_path): with open(file_path) as f: file_contents = f.read() - lines, file_issues, prev_indent = file_contents.splitlines(), [], 0 + lines, file_issues, prev_indent = file_contents.split("\n"), [], 0 has_with_import, given_with_warning = False, False is_block_comment = False @@ -58,6 +59,8 @@ def get_issues(base_path = DEFAULT_TARGET): if "\t" in whitespace: file_issues.append((i + 1, "indentation has a tab")) + elif "\r" in content: + file_issues.append((i + 1, "contains a windows newline")) elif content != content.rstrip(): file_issues.append((i + 1, "line has trailing whitespace")) elif content == '':

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 24 Jun '12

24 Jun '12

commit af3b5b0fdea800264c578892109952d51fd28d70 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 11:15:17 2012 +0000 Update translations for vidalia_help --- zh_CN/server.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/server.po b/zh_CN/server.po index a4feed7..988963c 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-06-24 10:33+0000\n" +"PO-Revision-Date: 2012-06-24 10:50+0000\n" "Last-Translator: Curtis Stone <cstone(a)fastmail.cn>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -285,7 +285,7 @@ msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" #: en/server.html:160 msgid "" "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber" -msgstr "" +msgstr "即时消息应用程序如MSN Messenger，AIM，ICQ，和Jabber" #. type: Content of: <html><body><table><tr><td> #: en/server.html:163

1 0