May 2015 - tor-commits - lists.torproject.org

[stem/master] Make revised tutorial tests run under python3
by atagar＠torproject.org 26 May '15

26 May '15

commit c79dc3d401de243bc7ae0e3146c8a6290a7f554a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 26 09:39:05 2015 -0700 Make revised tutorial tests run under python3 Python3 drops execfile(), so adding a helper function that does the same... https://stackoverflow.com/questions/436198/what-is-an-alternative-to-execfi… --- test/unit/tutorial.py | 14 ++++++++++---- test/unit/tutorial_examples.py | 20 ++++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 39e4f03..95634dc 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -36,6 +36,12 @@ MIRROR_MIRROR_OUTPUT = """\ """ +def exec_file(path): + with open(path) as f: + code = compile(f.read(), path, 'exec') + exec(code) + + class TestTutorial(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) @@ -46,7 +52,7 @@ class TestTutorial(unittest.TestCase): 'traffic/written': '29649', }[arg] - execfile('docs/_static/example/hello_world.py') + exec_file('docs/_static/example/hello_world.py') self.assertEqual('My Tor relay has read 33406 bytes and written 29649.\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -120,7 +126,7 @@ class TestTutorial(unittest.TestCase): def test_mirror_mirror_on_the_wall_1(self, downloader_mock, stdout_mock): downloader_mock().get_consensus().run.return_value = [mocking.get_router_status_entry_v2()] - execfile('docs/_static/example/current_descriptors.py') + exec_file('docs/_static/example/current_descriptors.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -129,7 +135,7 @@ class TestTutorial(unittest.TestCase): controller = from_port_mock().__enter__() controller.get_network_statuses.return_value = [mocking.get_router_status_entry_v2()] - execfile('docs/_static/example/descriptor_from_tor_control_socket.py') + exec_file('docs/_static/example/descriptor_from_tor_control_socket.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -158,7 +164,7 @@ class TestTutorial(unittest.TestCase): reader = reader_mock().__enter__() reader.__iter__.return_value = iter([mocking.get_relay_server_descriptor()]) - execfile('docs/_static/example/past_descriptors.py') + exec_file('docs/_static/example/past_descriptors.py') self.assertEqual('found relay caerSidi (None)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index ae73239..246b483 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -32,6 +32,8 @@ try: except ImportError: from mock import Mock, patch +OPEN_FUNCTION = open # make a reference so mocking open() won't mess with us + CIRC_CONTENT = '650 CIRC %d %s \ %s \ PURPOSE=%s' @@ -99,6 +101,12 @@ A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB: caerSidi """ +def exec_file(path): + with OPEN_FUNCTION(path, 'rb') as f: + code = compile(f.read(), path, 'exec') + exec(code) + + def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert('EVENT', controller_event) @@ -167,7 +175,7 @@ class TestTutorialExamples(unittest.TestCase): path_7[0]: _get_router_status('176.67.169.171') }[fingerprint] - execfile('docs/_static/example/list_circuits.py') + exec_file('docs/_static/example/list_circuits.py') self.assert_equal_unordered(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -231,7 +239,7 @@ class TestTutorialExamples(unittest.TestCase): get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), ] - execfile('docs/_static/example/outdated_relays.py') + exec_file('docs/_static/example/outdated_relays.py') self.assert_equal_unordered(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) @@ -272,7 +280,7 @@ class TestTutorialExamples(unittest.TestCase): [get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9]))], ] - execfile('docs/_static/example/compare_flags.py') + exec_file('docs/_static/example/compare_flags.py') self.assert_equal_unordered(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) @@ -311,7 +319,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock.side_effect = [query1, query2, query3, query4] - execfile('docs/_static/example/votes_by_bandwidth_authorities.py') + exec_file('docs/_static/example/votes_by_bandwidth_authorities.py') self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -335,7 +343,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock().run.return_value = [network_status] parse_file_mock.return_value = itertools.cycle([network_status]) - execfile('docs/_static/example/persisting_a_consensus.py') - execfile('docs/_static/example/persisting_a_consensus_with_parse_file.py') + exec_file('docs/_static/example/persisting_a_consensus.py') + exec_file('docs/_static/example/persisting_a_consensus_with_parse_file.py') self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Use python3 print statements for tutorial examples
by atagar＠torproject.org 26 May '15

26 May '15

commit f8d646ec969f0f7a7b4bf8afc2564a0c787832a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 26 09:51:44 2015 -0700 Use python3 print statements for tutorial examples Swiching our print statements to something compatible with both python 2.x and 3.x. With this our tests now pass with both versions. --- docs/_static/example/client_usage_using_pycurl.py | 8 ++++---- docs/_static/example/compare_flags.py | 10 +++++----- docs/_static/example/current_descriptors.py | 4 ++-- docs/_static/example/custom_path_selection.py | 4 ++-- .../example/descriptor_from_tor_control_socket.py | 2 +- .../example/descriptor_from_tor_data_directory.py | 2 +- docs/_static/example/ephemeral_hidden_services.py | 8 ++++---- docs/_static/example/exit_used.py | 16 ++++++++-------- docs/_static/example/get_hidden_service_descriptor.py | 2 +- docs/_static/example/hello_world.py | 2 +- docs/_static/example/introduction_points.py | 4 ++-- docs/_static/example/list_circuits.py | 6 +++--- docs/_static/example/outdated_relays.py | 10 +++++----- docs/_static/example/past_descriptors.py | 2 +- .../example/persisting_a_consensus_with_parse_file.py | 2 +- docs/_static/example/read_with_parse_file.py | 2 +- docs/_static/example/reading_twitter.py | 8 ++++---- docs/_static/example/running_hidden_service.py | 10 +++++----- docs/_static/example/tor_descriptors.py | 4 ++-- docs/_static/example/utilities.py | 14 +++++++------- docs/_static/example/validate_descriptor_content.py | 2 +- docs/_static/example/votes_by_bandwidth_authorities.py | 6 +++--- 22 files changed, 64 insertions(+), 64 deletions(-) diff --git a/docs/_static/example/client_usage_using_pycurl.py b/docs/_static/example/client_usage_using_pycurl.py index 847c106..a15db5e 100644 --- a/docs/_static/example/client_usage_using_pycurl.py +++ b/docs/_static/example/client_usage_using_pycurl.py @@ -35,10 +35,10 @@ def query(url): def print_bootstrap_lines(line): if "Bootstrapped " in line: - print term.format(line, term.Color.BLUE) + print(term.format(line, term.Color.BLUE)) -print term.format("Starting Tor:\n", term.Attr.BOLD) +print(term.format("Starting Tor:\n", term.Attr.BOLD)) tor_process = stem.process.launch_tor_with_config( config = { @@ -48,7 +48,7 @@ tor_process = stem.process.launch_tor_with_config( init_msg_handler = print_bootstrap_lines, ) -print term.format("\nChecking our endpoint:\n", term.Attr.BOLD) -print term.format(query("https://www.atagar.com/echo.php"), term.Color.BLUE) +print(term.format("\nChecking our endpoint:\n", term.Attr.BOLD)) +print(term.format(query("https://www.atagar.com/echo.php"), term.Color.BLUE)) tor_process.kill() # stops tor diff --git a/docs/_static/example/compare_flags.py b/docs/_static/example/compare_flags.py index a668e11..84f8a4f 100644 --- a/docs/_static/example/compare_flags.py +++ b/docs/_static/example/compare_flags.py @@ -30,12 +30,12 @@ for fingerprint in all_fingerprints: maatuska_vote = votes['maatuska'].routers.get(fingerprint) if not moria1_vote and not maatuska_vote: - print "both moria1 and maatuska haven't voted about %s" % fingerprint + print("both moria1 and maatuska haven't voted about %s" % fingerprint) elif not moria1_vote: - print "moria1 hasn't voted about %s" % fingerprint + print("moria1 hasn't voted about %s" % fingerprint) elif not maatuska_vote: - print "maatuska hasn't voted about %s" % fingerprint + print("maatuska hasn't voted about %s" % fingerprint) elif 'Running' in moria1_vote.flags and 'Running' not in maatuska_vote.flags: - print "moria1 has the Running flag but maatuska doesn't: %s" % fingerprint + print("moria1 has the Running flag but maatuska doesn't: %s" % fingerprint) elif 'Running' in maatuska_vote.flags and 'Running' not in moria1_vote.flags: - print "maatuska has the Running flag but moria1 doesn't: %s" % fingerprint + print("maatuska has the Running flag but moria1 doesn't: %s" % fingerprint) diff --git a/docs/_static/example/current_descriptors.py b/docs/_static/example/current_descriptors.py index 9ddca01..f86b5b9 100644 --- a/docs/_static/example/current_descriptors.py +++ b/docs/_static/example/current_descriptors.py @@ -4,6 +4,6 @@ downloader = DescriptorDownloader() try: for desc in downloader.get_consensus().run(): - print "found relay %s (%s)" % (desc.nickname, desc.fingerprint) + print("found relay %s (%s)" % (desc.nickname, desc.fingerprint)) except Exception as exc: - print "Unable to retrieve the consensus: %s" % exc + print("Unable to retrieve the consensus: %s" % exc) diff --git a/docs/_static/example/custom_path_selection.py b/docs/_static/example/custom_path_selection.py index 48f6ee7..610ec28 100644 --- a/docs/_static/example/custom_path_selection.py +++ b/docs/_static/example/custom_path_selection.py @@ -74,6 +74,6 @@ with stem.control.Controller.from_port() as controller: for fingerprint in relay_fingerprints: try: time_taken = scan(controller, [fingerprint, EXIT_FINGERPRINT]) - print '%s => %0.2f seconds' % (fingerprint, time_taken) + print('%s => %0.2f seconds' % (fingerprint, time_taken)) except Exception as exc: - print '%s => %s' % (fingerprint, exc) + print('%s => %s' % (fingerprint, exc)) diff --git a/docs/_static/example/descriptor_from_tor_control_socket.py b/docs/_static/example/descriptor_from_tor_control_socket.py index 202f66e..349f6f6 100644 --- a/docs/_static/example/descriptor_from_tor_control_socket.py +++ b/docs/_static/example/descriptor_from_tor_control_socket.py @@ -4,4 +4,4 @@ with Controller.from_port(port = 9051) as controller: controller.authenticate() for desc in controller.get_network_statuses(): - print "found relay %s (%s)" % (desc.nickname, desc.fingerprint) + print("found relay %s (%s)" % (desc.nickname, desc.fingerprint)) diff --git a/docs/_static/example/descriptor_from_tor_data_directory.py b/docs/_static/example/descriptor_from_tor_data_directory.py index cdfd78b..5125cf4 100644 --- a/docs/_static/example/descriptor_from_tor_data_directory.py +++ b/docs/_static/example/descriptor_from_tor_data_directory.py @@ -1,4 +1,4 @@ from stem.descriptor import parse_file for desc in parse_file('/home/atagar/.tor/cached-consensus'): - print 'found relay %s (%s)' % (desc.nickname, desc.fingerprint) + print('found relay %s (%s)' % (desc.nickname, desc.fingerprint)) diff --git a/docs/_static/example/ephemeral_hidden_services.py b/docs/_static/example/ephemeral_hidden_services.py index b3b621b..85d36fa 100644 --- a/docs/_static/example/ephemeral_hidden_services.py +++ b/docs/_static/example/ephemeral_hidden_services.py @@ -9,7 +9,7 @@ def index(): return "<h1>Hi Grandma!</h1>" -print ' * Connecting to tor' +print(' * Connecting to tor') with Controller.from_port() as controller: controller.authenticate() @@ -17,11 +17,11 @@ with Controller.from_port() as controller: # Create a hidden service where visitors of port 80 get redirected to local # port 5000 (this is where Flask runs by default). - print " * Creating our hidden service in %s" % hidden_service_dir + print(" * Creating our hidden service in %s" % hidden_service_dir) response = controller.create_ephemeral_hidden_service({80: 5000}, await_publication = True) - print " * Our service is available at %s.onion, press ctrl+c to quit" % response.service_id + print(" * Our service is available at %s.onion, press ctrl+c to quit" % response.service_id) try: app.run() finally: - print " * Shutting down our hidden service" + print(" * Shutting down our hidden service") diff --git a/docs/_static/example/exit_used.py b/docs/_static/example/exit_used.py index 7ecd19a..9a16c13 100644 --- a/docs/_static/example/exit_used.py +++ b/docs/_static/example/exit_used.py @@ -4,8 +4,8 @@ from stem import StreamStatus from stem.control import EventType, Controller def main(): - print "Tracking requests for tor exits. Press 'enter' to end." - print + print("Tracking requests for tor exits. Press 'enter' to end.") + print("") with Controller.from_port() as controller: controller.authenticate() @@ -23,12 +23,12 @@ def stream_event(controller, event): exit_fingerprint = circ.path[-1][0] exit_relay = controller.get_network_status(exit_fingerprint) - print "Exit relay for our connection to %s" % (event.target) - print " address: %s:%i" % (exit_relay.address, exit_relay.or_port) - print " fingerprint: %s" % exit_relay.fingerprint - print " nickname: %s" % exit_relay.nickname - print " locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown') - print + print("Exit relay for our connection to %s" % (event.target)) + print(" address: %s:%i" % (exit_relay.address, exit_relay.or_port)) + print(" fingerprint: %s" % exit_relay.fingerprint) + print(" nickname: %s" % exit_relay.nickname) + print(" locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown')) + print("") if __name__ == '__main__': diff --git a/docs/_static/example/get_hidden_service_descriptor.py b/docs/_static/example/get_hidden_service_descriptor.py index baeec1d..98c1bf9 100644 --- a/docs/_static/example/get_hidden_service_descriptor.py +++ b/docs/_static/example/get_hidden_service_descriptor.py @@ -5,4 +5,4 @@ with Controller.from_port(port = 9051) as controller: # descriptor of duck-duck-go's hidden service (http://3g2upl4pq6kufc4m.onion) - print controller.get_hidden_service_descriptor('3g2upl4pq6kufc4m') + print(controller.get_hidden_service_descriptor('3g2upl4pq6kufc4m')) diff --git a/docs/_static/example/hello_world.py b/docs/_static/example/hello_world.py index 88dd881..4e5df98 100644 --- a/docs/_static/example/hello_world.py +++ b/docs/_static/example/hello_world.py @@ -6,4 +6,4 @@ with Controller.from_port(port = 9051) as controller: bytes_read = controller.get_info("traffic/read") bytes_written = controller.get_info("traffic/written") - print "My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written) + print("My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written)) diff --git a/docs/_static/example/introduction_points.py b/docs/_static/example/introduction_points.py index 3c97e47..973a71c 100644 --- a/docs/_static/example/introduction_points.py +++ b/docs/_static/example/introduction_points.py @@ -4,7 +4,7 @@ with Controller.from_port(port = 9051) as controller: controller.authenticate() desc = controller.get_hidden_service_descriptor('3g2upl4pq6kufc4m') - print "DuckDuckGo's introduction points are...\n" + print("DuckDuckGo's introduction points are...\n") for introduction_point in desc.introduction_points(): - print ' %s:%s => %s' % (introduction_point.address, introduction_point.port, introduction_point.identifier) + print(' %s:%s => %s' % (introduction_point.address, introduction_point.port, introduction_point.identifier)) diff --git a/docs/_static/example/list_circuits.py b/docs/_static/example/list_circuits.py index 61fdd5e..b89e99f 100644 --- a/docs/_static/example/list_circuits.py +++ b/docs/_static/example/list_circuits.py @@ -8,8 +8,8 @@ with Controller.from_port(port = 9051) as controller: if circ.status != CircStatus.BUILT: continue - print - print "Circuit %s (%s)" % (circ.id, circ.purpose) + print("") + print("Circuit %s (%s)" % (circ.id, circ.purpose)) for i, entry in enumerate(circ.path): div = '+' if (i == len(circ.path) - 1) else '|' @@ -18,4 +18,4 @@ with Controller.from_port(port = 9051) as controller: desc = controller.get_network_status(fingerprint, None) address = desc.address if desc else 'unknown' - print " %s- %s (%s, %s)" % (div, fingerprint, nickname, address) + print(" %s- %s (%s, %s)" % (div, fingerprint, nickname, address)) diff --git a/docs/_static/example/outdated_relays.py b/docs/_static/example/outdated_relays.py index a78c6ee..67d0ea9 100644 --- a/docs/_static/example/outdated_relays.py +++ b/docs/_static/example/outdated_relays.py @@ -4,16 +4,16 @@ from stem.version import Version downloader = DescriptorDownloader() count, with_contact = 0, 0 -print "Checking for outdated relays..." -print +print("Checking for outdated relays...") +print("") for desc in downloader.get_server_descriptors(): if desc.tor_version < Version('0.2.3.0'): count += 1 if desc.contact: - print ' %-15s %s' % (desc.tor_version, desc.contact.decode("utf-8", "replace")) + print(' %-15s %s' % (desc.tor_version, desc.contact.decode("utf-8", "replace"))) with_contact += 1 -print -print "%i outdated relays found, %i had contact information" % (count, with_contact) +print("") +print("%i outdated relays found, %i had contact information" % (count, with_contact)) diff --git a/docs/_static/example/past_descriptors.py b/docs/_static/example/past_descriptors.py index 4b3e5cb..4100484 100644 --- a/docs/_static/example/past_descriptors.py +++ b/docs/_static/example/past_descriptors.py @@ -2,4 +2,4 @@ from stem.descriptor.reader import DescriptorReader with DescriptorReader(["/home/atagar/server-descriptors-2013-03.tar"]) as reader: for desc in reader: - print "found relay %s (%s)" % (desc.nickname, desc.fingerprint) + print("found relay %s (%s)" % (desc.nickname, desc.fingerprint)) diff --git a/docs/_static/example/persisting_a_consensus_with_parse_file.py b/docs/_static/example/persisting_a_consensus_with_parse_file.py index bbec73a..4a78c46 100644 --- a/docs/_static/example/persisting_a_consensus_with_parse_file.py +++ b/docs/_static/example/persisting_a_consensus_with_parse_file.py @@ -7,4 +7,4 @@ consensus = next(parse_file( )) for fingerprint, relay in consensus.routers.items(): - print "%s: %s" % (fingerprint, relay.nickname) + print("%s: %s" % (fingerprint, relay.nickname)) diff --git a/docs/_static/example/read_with_parse_file.py b/docs/_static/example/read_with_parse_file.py index 96ec99e..da78b21 100644 --- a/docs/_static/example/read_with_parse_file.py +++ b/docs/_static/example/read_with_parse_file.py @@ -3,4 +3,4 @@ from stem.descriptor import parse_file server_descriptors = parse_file('/tmp/descriptor_dump', descriptor_type = 'server-descriptor 1.0') for relay in server_descriptors: - print relay.fingerprint + print(relay.fingerprint) diff --git a/docs/_static/example/reading_twitter.py b/docs/_static/example/reading_twitter.py index b5dc684..28f840d 100644 --- a/docs/_static/example/reading_twitter.py +++ b/docs/_static/example/reading_twitter.py @@ -78,10 +78,10 @@ tor_process = stem.process.launch_tor_with_config( try: for index, tweet in enumerate(poll_twitter_feed('ioerror', 3)): - print "%i. %s" % (index + 1, tweet["created_at"]) - print tweet["text"] - print + print("%i. %s" % (index + 1, tweet["created_at"])) + print(tweet["text"]) + print("") except IOError, exc: - print exc + print(exc) finally: tor_process.kill() # stops tor diff --git a/docs/_static/example/running_hidden_service.py b/docs/_static/example/running_hidden_service.py index 4a4d923..5392ef4 100644 --- a/docs/_static/example/running_hidden_service.py +++ b/docs/_static/example/running_hidden_service.py @@ -12,7 +12,7 @@ def index(): return "<h1>Hi Grandma!</h1>" -print ' * Connecting to tor' +print(' * Connecting to tor') with Controller.from_port() as controller: controller.authenticate() @@ -25,16 +25,16 @@ with Controller.from_port() as controller: # Create a hidden service where visitors of port 80 get redirected to local # port 5000 (this is where Flask runs by default). - print " * Creating our hidden service in %s" % hidden_service_dir + print(" * Creating our hidden service in %s" % hidden_service_dir) result = controller.create_hidden_service(hidden_service_dir, 80, target_port = 5000) # The hostname is only available when we can read the hidden service # directory. This requires us to be running with the same user as tor. if result.hostname: - print " * Our service is available at %s, press ctrl+c to quit" % result.hostname + print(" * Our service is available at %s, press ctrl+c to quit" % result.hostname) else: - print " * Unable to determine our service's hostname, probably due to being unable to read the hidden service directory" + print(" * Unable to determine our service's hostname, probably due to being unable to read the hidden service directory") try: app.run() @@ -43,6 +43,6 @@ with Controller.from_port() as controller: # want to delete the hidden service directory if you'd like to have this # same *.onion address in the future. - print " * Shutting down our hidden service" + print(" * Shutting down our hidden service") controller.remove_hidden_service(hidden_service_dir) shutil.rmtree(hidden_service_dir) diff --git a/docs/_static/example/tor_descriptors.py b/docs/_static/example/tor_descriptors.py index 2b59ad4..0ec0666 100644 --- a/docs/_static/example/tor_descriptors.py +++ b/docs/_static/example/tor_descriptors.py @@ -14,7 +14,7 @@ def get_bw_to_relay(): if desc.exit_policy.is_exiting_allowed(): bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) except Exception as exc: - print "Unable to retrieve the server descriptors: %s" % exc + print("Unable to retrieve the server descriptors: %s" % exc) return bw_to_relay @@ -25,7 +25,7 @@ count = 1 for bw_value in sorted(bw_to_relay.keys(), reverse = True): for nickname in bw_to_relay[bw_value]: - print "%i. %s (%s/s)" % (count, nickname, str_tools.size_label(bw_value, 2)) + print("%i. %s (%s/s)" % (count, nickname, str_tools.size_label(bw_value, 2))) count += 1 if count > 15: diff --git a/docs/_static/example/utilities.py b/docs/_static/example/utilities.py index 460f6ff..0e8f01f 100644 --- a/docs/_static/example/utilities.py +++ b/docs/_static/example/utilities.py @@ -6,23 +6,23 @@ from stem.util.system import pid_by_name resolvers = system_resolvers() if not resolvers: - print "Stem doesn't support any connection resolvers on our platform." + print("Stem doesn't support any connection resolvers on our platform.") sys.exit(1) picked_resolver = resolvers[0] # lets just opt for the first -print "Our platform supports connection resolution via: %s (picked %s)" % (', '.join(resolvers), picked_resolver) +print("Our platform supports connection resolution via: %s (picked %s)" % (', '.join(resolvers), picked_resolver)) tor_pids = pid_by_name('tor', multiple = True) if not tor_pids: - print "Unable to get tor's pid. Is it running?" + print("Unable to get tor's pid. Is it running?") sys.exit(1) elif len(tor_pids) > 1: - print "You're running %i instances of tor, picking the one with pid %i" % (len(tor_pids), tor_pids[0]) + print("You're running %i instances of tor, picking the one with pid %i" % (len(tor_pids), tor_pids[0])) else: - print "Tor is running with pid %i" % tor_pids[0] + print("Tor is running with pid %i" % tor_pids[0]) -print "\nConnections:\n" +print("\nConnections:\n") for conn in get_connections(picked_resolver, process_pid = tor_pids[0], process_name = 'tor'): - print " %s:%s => %s:%s" % (conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) + print(" %s:%s => %s:%s" % (conn.local_address, conn.local_port, conn.remote_address, conn.remote_port)) diff --git a/docs/_static/example/validate_descriptor_content.py b/docs/_static/example/validate_descriptor_content.py index f6b27a5..f47ed5d 100644 --- a/docs/_static/example/validate_descriptor_content.py +++ b/docs/_static/example/validate_descriptor_content.py @@ -1,4 +1,4 @@ from stem.descriptor import parse_file for desc in parse_file('/home/atagar/.tor/cached-consensus', validate = True): - print 'found relay %s (%s)' % (desc.nickname, desc.fingerprint) + print('found relay %s (%s)' % (desc.nickname, desc.fingerprint)) diff --git a/docs/_static/example/votes_by_bandwidth_authorities.py b/docs/_static/example/votes_by_bandwidth_authorities.py index e957be5..f6816b7 100644 --- a/docs/_static/example/votes_by_bandwidth_authorities.py +++ b/docs/_static/example/votes_by_bandwidth_authorities.py @@ -14,7 +14,7 @@ for authority in remote.get_authorities().values(): for authority_name, query in queries.items(): try: - print "Getting %s's vote from %s:" % (authority_name, query.download_url) + print("Getting %s's vote from %s:" % (authority_name, query.download_url)) measured, unmeasured = 0, 0 @@ -24,6 +24,6 @@ for authority_name, query in queries.items(): else: unmeasured += 1 - print ' %i measured entries and %i unmeasured' % (measured, unmeasured) + print(' %i measured entries and %i unmeasured' % (measured, unmeasured)) except Exception as exc: - print " failed to get the vote (%s)" % exc + print(" failed to get the vote (%s)" % exc)

1 0

[stem/master] Test against tutorial examples
by atagar＠torproject.org 26 May '15

26 May '15

commit a1278e2253f8cce462c008a400c603bb114f3d34 Merge: 2a0110c f8d646e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 26 09:54:14 2015 -0700 Test against tutorial examples Now that our tutorial eamples live in their own files we can invoke those rather than duplicating the code in our tests. Both cleaner and less error prone - yay! https://trac.torproject.org/projects/tor/ticket/16191 docs/_static/example/client_usage_using_pycurl.py | 8 +- docs/_static/example/compare_flags.py | 10 +- docs/_static/example/current_descriptors.py | 4 +- docs/_static/example/custom_path_selection.py | 4 +- .../example/descriptor_from_tor_control_socket.py | 2 +- .../example/descriptor_from_tor_data_directory.py | 2 +- docs/_static/example/ephemeral_hidden_services.py | 8 +- docs/_static/example/exit_used.py | 16 +-- .../example/get_hidden_service_descriptor.py | 2 +- docs/_static/example/hello_world.py | 2 +- docs/_static/example/introduction_points.py | 4 +- docs/_static/example/list_circuits.py | 6 +- docs/_static/example/outdated_relays.py | 10 +- docs/_static/example/past_descriptors.py | 2 +- .../persisting_a_consensus_with_parse_file.py | 2 +- docs/_static/example/read_with_parse_file.py | 2 +- docs/_static/example/reading_twitter.py | 8 +- docs/_static/example/running_hidden_service.py | 10 +- docs/_static/example/tor_descriptors.py | 4 +- docs/_static/example/utilities.py | 14 +- .../_static/example/validate_descriptor_content.py | 2 +- .../example/votes_by_bandwidth_authorities.py | 6 +- test/unit/tutorial.py | 52 ++----- test/unit/tutorial_examples.py | 151 ++------------------ 24 files changed, 88 insertions(+), 243 deletions(-)

1 0

[tor/maint-0.2.6] Fix unit tests on MSVC2013.
by nickm＠torproject.org 26 May '15

26 May '15

commit 8ca3773f686c43328f3c05a35d4d0e61a30b980c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 26 10:24:21 2015 -0400 Fix unit tests on MSVC2013. Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha. --- changes/bug16030 | 3 +++ src/test/test_channel.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug16030 b/changes/bug16030 new file mode 100644 index 0000000..c14fd62 --- /dev/null +++ b/changes/bug16030 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Fix a crash in the unit tests on MSVC2013. Fixes bug 16030; bugfix on + 0.2.6.2-alpha. Patch from "NewEraCracker". \ No newline at end of file diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 6cf6649..e11ac3f 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -420,6 +420,7 @@ new_fake_channel(void) chan->close = chan_test_close; chan->get_overhead_estimate = chan_test_get_overhead_estimate; + chan->get_remote_descr = chan_test_get_remote_descr; chan->num_bytes_queued = chan_test_num_bytes_queued; chan->num_cells_writeable = chan_test_num_cells_writeable; chan->write_cell = chan_test_write_cell; @@ -615,7 +616,6 @@ test_channel_dumpstats(void *arg) /* Test channel_dump_statistics */ ch->describe_transport = chan_test_describe_transport; ch->dumpstats = chan_test_dumpstats; - ch->get_remote_descr = chan_test_get_remote_descr; ch->is_canonical = chan_test_is_canonical; old_count = test_dumpstats_calls; channel_dump_statistics(ch, LOG_DEBUG);

1 0

[torspec/master] Remove a needless nonce from secret_input in prop224.
by nickm＠torproject.org 26 May '15

26 May '15

commit fc441790ab61435430b482438b7cba4102d6442e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 26 09:57:53 2015 -0400 Remove a needless nonce from secret_input in prop224. The salt serves the same purpose as 'nonce' did in secret_input, by ensuring that the KDF does not produce the same output twice even in event of accidental revision counter replay. Pointed out by DonnchaC. --- proposals/224-rend-spec-ng.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 9ee628c..0b6fde2 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -852,7 +852,7 @@ Status: Draft salt = 16 random bytes - secret_input = nonce | blinded_public_key | subcredential | + secret_input = blinded_public_key | subcredential | INT_4(revision_counter) keys = KDF(secret_input, salt, "hsdir-encrypted-data", S_KEY_LEN + S_IV_LEN + MAC_KEY_LEN)

1 0

[torspec/master] Fix typos in proposal 224
by nickm＠torproject.org 26 May '15

26 May '15

commit f508fabbb8869c70c9326a8f275ef762b9e337a4 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue May 26 13:11:02 2015 +0100 Fix typos in proposal 224 --- proposals/224-rend-spec-ng.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index ffef617..9ee628c 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -26,6 +26,8 @@ Status: Draft 2014-02-20: Move more things to the revised certificate format in the new updated proposal 220. + 2015-05-26: Fix two typos. + 0. Hidden services: overview and preliminaries. @@ -389,7 +391,7 @@ Status: Draft may decide to respond or not respond to the client's request depending on the contents of the request. The protocol is extensible at this point: at a minimum, the server requires that the client - demonstrate knowledge od the contents of the encrypted portion of the + demonstrate knowledge of the contents of the encrypted portion of the hidden service descriptor. The service may additionally require a user- or group-specific access token before it responds to requests. @@ -730,7 +732,7 @@ Status: Draft that, in order to make the system better tolerate disappearing HSDirs, hsdir_spread_fetch may be less than hsdir_spread_store.) - An HSDir should rejects a descriptor if that HSDir is not one of the + An HSDir should reject a descriptor if that HSDir is not one of the first hsdir_spread_accept HSDirs for that node. [TODO: Incorporate the findings from proposal 143 here. But watch

1 0

[tor/master] Fix --enable-systemd builds on systems with libsystemd but not systemd
by nickm＠torproject.org 26 May '15

26 May '15

commit 08e8c21b1f0acac5e023d05d59f175f2f5716288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 26 09:39:53 2015 -0400 Fix --enable-systemd builds on systems with libsystemd but not systemd Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader. --- changes/bug16164 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug16164 b/changes/bug16164 new file mode 100644 index 0000000..fbb383c --- /dev/null +++ b/changes/bug16164 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Build with --enable-systemd correctly when libsystemd is installed, + but systemd is not. Fixes bug 16164, bugfix on 0.2.6.3-alpha. Patch + from Peter Palfrader. diff --git a/configure.ac b/configure.ac index 81ef2c7..156bb3f 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,7 @@ if test x$have_systemd = xyes; then AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd]) TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}" TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}" - PKG_CHECK_MODULES(SYSTEMD209, [systemd >= 209], + PKG_CHECK_MODULES(LIBSYSTEMD209, [libsystemd >= 209], [AC_DEFINE(HAVE_SYSTEMD_209,1,[Have systemd v209 or more])], []) fi AC_SUBST(TOR_SYSTEMD_CFLAGS)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 26 May '15

26 May '15

commit 115dd554c5d0126c1b006f283f6411733b3a70b1 Merge: c8024b6 08e8c21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 26 09:41:30 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug16164 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Fix --enable-systemd builds on systems with libsystemd but not systemd
by nickm＠torproject.org 26 May '15

26 May '15

commit 08e8c21b1f0acac5e023d05d59f175f2f5716288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 26 09:39:53 2015 -0400 Fix --enable-systemd builds on systems with libsystemd but not systemd Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader. --- changes/bug16164 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug16164 b/changes/bug16164 new file mode 100644 index 0000000..fbb383c --- /dev/null +++ b/changes/bug16164 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Build with --enable-systemd correctly when libsystemd is installed, + but systemd is not. Fixes bug 16164, bugfix on 0.2.6.3-alpha. Patch + from Peter Palfrader. diff --git a/configure.ac b/configure.ac index 81ef2c7..156bb3f 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,7 @@ if test x$have_systemd = xyes; then AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd]) TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}" TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}" - PKG_CHECK_MODULES(SYSTEMD209, [systemd >= 209], + PKG_CHECK_MODULES(LIBSYSTEMD209, [libsystemd >= 209], [AC_DEFINE(HAVE_SYSTEMD_209,1,[Have systemd v209 or more])], []) fi AC_SUBST(TOR_SYSTEMD_CFLAGS)

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 26 May '15

26 May '15

commit 81cc60a9450382cf927d3ff10ab2490fdfbda7f3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 26 13:16:26 2015 +0000 Update translations for torbutton-aboutdialogdtd --- tr/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutdialog.dtd b/tr/aboutdialog.dtd index 14c0354..718215f 100644 --- a/tr/aboutdialog.dtd +++ b/tr/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Tor ağının büyümesine yardım edin.">  -<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY bottomLinks.license "Lisans bilgisi"> <!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">

1 0