January 2020 - tor-commits - lists.torproject.org

[snowflake/master] Make timeout constants into time.Duration values.
by dcf＠torproject.org 31 Jan '20

31 Jan '20

commit a2292ce35be6ba4b63e7c8dbac8b3c7bc220822a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 18:39:43 2019 -0700 Make timeout constants into time.Duration values. This slightly changes some log messages. --- client/lib/snowflake.go | 5 +++-- client/lib/webrtc.go | 10 +++++----- client/snowflake.go | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 9ab6fc6..2065f73 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -6,11 +6,12 @@ import ( "log" "net" "sync" + "time" ) const ( - ReconnectTimeout = 10 - SnowflakeTimeout = 30 + ReconnectTimeout = 10 * time.Second + SnowflakeTimeout = 30 * time.Second ) // Given an accepted SOCKS connection, establish a WebRTC connection to the diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 9d1ba37..8e06d98 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -117,9 +117,9 @@ func (c *WebRTCPeer) checkForStaleness() { if c.closed { return } - if time.Since(c.lastReceive).Seconds() > SnowflakeTimeout { - log.Println("WebRTC: No messages received for", SnowflakeTimeout, - "seconds -- closing stale connection.") + if time.Since(c.lastReceive) > SnowflakeTimeout { + log.Printf("WebRTC: No messages received for %v -- closing stale connection.", + SnowflakeTimeout) c.Close() return } @@ -314,8 +314,8 @@ func (c *WebRTCPeer) exchangeSDP() error { go c.sendOfferToBroker() answer, ok = <-c.answerChannel // Blocks... if !ok || nil == answer { - log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) - <-time.After(time.Second * ReconnectTimeout) + log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout) + <-time.After(ReconnectTimeout) answer = nil } } diff --git a/client/snowflake.go b/client/snowflake.go index af416be..edcbd4a 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -31,11 +31,11 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) { // Check if ending is necessary. _, err := snowflakes.Collect() if err != nil { - log.Printf("WebRTC: %v Retrying in %v seconds...", + log.Printf("WebRTC: %v Retrying in %v...", err, sf.ReconnectTimeout) } select { - case <-time.After(time.Second * sf.ReconnectTimeout): + case <-time.After(sf.ReconnectTimeout): continue case <-snowflakes.Melted(): log.Println("ConnectLoop: stopped.")

1 0

[snowflake/master] Allow handling multiple SOCKS connections simultaneously.
by dcf＠torproject.org 31 Jan '20

31 Jan '20

commit dfb83c6606fe129d57f101d837ebe32133d79c61 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 28 03:10:54 2020 -0700 Allow handling multiple SOCKS connections simultaneously. Close the SOCKS connection in the same function that opens it. --- client/lib/snowflake.go | 1 - client/snowflake.go | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index a27c6a5..9ab6fc6 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -25,7 +25,6 @@ func Handler(socks SocksConnector, snowflakes SnowflakeCollector) error { return errors.New("handler: Received invalid Snowflake") } - defer socks.Close() defer snowflake.Close() log.Println("---- Handler: snowflake assigned ----") err := socks.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) diff --git a/client/snowflake.go b/client/snowflake.go index 7cb9451..af416be 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -57,10 +57,13 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { break } log.Printf("SOCKS accepted: %v", conn.Req) - err = sf.Handler(conn, snowflakes) - if err != nil { - log.Printf("handler error: %s", err) - } + go func() { + defer conn.Close() + err = sf.Handler(conn, snowflakes) + if err != nil { + log.Printf("handler error: %s", err) + } + }() } }

1 0

[snowflake/master] Have websocketconn.New return a pointer.
by dcf＠torproject.org 31 Jan '20

31 Jan '20

commit 20ac2029fd671ccfa8af240fe9c91d9653715ebc Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 28 02:37:10 2020 -0700 Have websocketconn.New return a pointer. This makes the return type satisfy the io.ReadWriteCloser interface directly. --- common/websocketconn/websocketconn.go | 4 ++-- proxy-go/snowflake.go | 2 +- server/server.go | 2 +- server/server_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/websocketconn/websocketconn.go b/common/websocketconn/websocketconn.go index 8a9e015..b87e657 100644 --- a/common/websocketconn/websocketconn.go +++ b/common/websocketconn/websocketconn.go @@ -63,8 +63,8 @@ func (conn *Conn) Close() error { } // Create a new Conn. -func New(ws *websocket.Conn) Conn { +func New(ws *websocket.Conn) *Conn { var conn Conn conn.Ws = ws - return conn + return &conn } diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 675d76a..e964a07 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -288,7 +288,7 @@ func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { wsConn := websocketconn.New(ws) log.Printf("connected to relay") defer wsConn.Close() - CopyLoop(conn, &wsConn) + CopyLoop(conn, wsConn) log.Printf("datachannelHandler ends") } diff --git a/server/server.go b/server/server.go index 739a55a..5d3bfc6 100644 --- a/server/server.go +++ b/server/server.go @@ -125,7 +125,7 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } defer or.Close() - proxy(or, &conn) + proxy(or, conn) } func initServer(addr *net.TCPAddr, diff --git a/server/server_test.go b/server/server_test.go index bbc9ba9..d4ada6e 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -66,7 +66,7 @@ func (handler *StubHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { //dial stub OR or, _ := net.DialTCP("tcp", nil, &net.TCPAddr{IP: net.ParseIP("localhost"), Port: 8889}) - proxy(or, &conn) + proxy(or, conn) } func Test(t *testing.T) {

1 0

[snowflake/master] Remove some redundancy in websocketconn naming.
by dcf＠torproject.org 31 Jan '20

31 Jan '20

commit e47dd5e2b44161b6699ca6560878ddc9730a63b1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 28 00:54:26 2020 -0700 Remove some redundancy in websocketconn naming. Rename websocketconn.WebSocketConn to websocketconn.Conn, and websocketconn.NewWebSocketConn to websocketconn.New Following the guidelines at https://blog.golang.org/package-names#TOC_3%2e --- common/websocketconn/websocketconn.go | 14 +++++++------- proxy-go/snowflake.go | 2 +- server/server.go | 4 ++-- server/server_test.go | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/websocketconn/websocketconn.go b/common/websocketconn/websocketconn.go index 7e12abf..8a9e015 100644 --- a/common/websocketconn/websocketconn.go +++ b/common/websocketconn/websocketconn.go @@ -9,13 +9,13 @@ import ( // An abstraction that makes an underlying WebSocket connection look like an // io.ReadWriteCloser. -type WebSocketConn struct { +type Conn struct { Ws *websocket.Conn r io.Reader } // Implements io.Reader. -func (conn *WebSocketConn) Read(b []byte) (n int, err error) { +func (conn *Conn) Read(b []byte) (n int, err error) { var opCode int if conn.r == nil { // New message @@ -43,7 +43,7 @@ func (conn *WebSocketConn) Read(b []byte) (n int, err error) { } // Implements io.Writer. -func (conn *WebSocketConn) Write(b []byte) (n int, err error) { +func (conn *Conn) Write(b []byte) (n int, err error) { var w io.WriteCloser if w, err = conn.Ws.NextWriter(websocket.BinaryMessage); err != nil { return @@ -56,15 +56,15 @@ func (conn *WebSocketConn) Write(b []byte) (n int, err error) { } // Implements io.Closer. -func (conn *WebSocketConn) Close() error { +func (conn *Conn) Close() error { // Ignore any error in trying to write a Close frame. _ = conn.Ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second)) return conn.Ws.Close() } -// Create a new WebSocketConn. -func NewWebSocketConn(ws *websocket.Conn) WebSocketConn { - var conn WebSocketConn +// Create a new Conn. +func New(ws *websocket.Conn) Conn { + var conn Conn conn.Ws = ws return conn } diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index dce7b70..675d76a 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -285,7 +285,7 @@ func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { log.Printf("error dialing relay: %s", err) return } - wsConn := websocketconn.NewWebSocketConn(ws) + wsConn := websocketconn.New(ws) log.Printf("connected to relay") defer wsConn.Close() CopyLoop(conn, &wsConn) diff --git a/server/server.go b/server/server.go index acb260a..739a55a 100644 --- a/server/server.go +++ b/server/server.go @@ -52,7 +52,7 @@ additional HTTP listener on port 80 to work with ACME. } // Copy from WebSocket to socket and vice versa. -func proxy(local *net.TCPConn, conn *websocketconn.WebSocketConn) { +func proxy(local *net.TCPConn, conn *websocketconn.Conn) { var wg sync.WaitGroup wg.Add(2) @@ -107,7 +107,7 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } - conn := websocketconn.NewWebSocketConn(ws) + conn := websocketconn.New(ws) defer conn.Close() // Pass the address of client as the remote address of incoming connection diff --git a/server/server_test.go b/server/server_test.go index 7a72014..bbc9ba9 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -60,7 +60,7 @@ type StubHandler struct{} func (handler *StubHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { ws, _ := upgrader.Upgrade(w, r, nil) - conn := websocketconn.NewWebSocketConn(ws) + conn := websocketconn.New(ws) defer conn.Close() //dial stub OR @@ -90,7 +90,7 @@ func Test(t *testing.T) { So(err, ShouldBeNil) ws, _, err := websocket.DefaultDialer.Dial("ws://localhost:8888", nil) - wsConn := websocketconn.NewWebSocketConn(ws) + wsConn := websocketconn.New(ws) So(err, ShouldEqual, nil) So(wsConn, ShouldNotEqual, nil) @@ -133,7 +133,7 @@ func Test(t *testing.T) { ws, _, err := websocket.DefaultDialer.Dial("ws://localhost:8888", nil) So(err, ShouldEqual, nil) - wsConn := websocketconn.NewWebSocketConn(ws) + wsConn := websocketconn.New(ws) So(wsConn, ShouldNotEqual, nil) wsConn.Write([]byte("Hello"))

1 0

[snowflake/master] Initialize the global upgrader.CheckOrigin statically.
by dcf＠torproject.org 31 Jan '20

31 Jan '20

commit 5b01df903085fbba96e52277e598c395bce27d88 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 28 00:09:38 2020 -0700 Initialize the global upgrader.CheckOrigin statically. Only once, not again on every call to initServer. --- server/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/server.go b/server/server.go index 9023252..acb260a 100644 --- a/server/server.go +++ b/server/server.go @@ -94,7 +94,9 @@ func clientAddr(clientIPParam string) string { return (&net.TCPAddr{IP: clientIP, Port: 1, Zone: ""}).String() } -var upgrader = websocket.Upgrader{} +var upgrader = websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { return true }, +} type HTTPHandler struct{} @@ -139,8 +141,6 @@ func initServer(addr *net.TCPAddr, return nil, fmt.Errorf("cannot listen on port %d; configure a port using ServerTransportListenAddr", addr.Port) } - upgrader.CheckOrigin = func(r *http.Request) bool { return true } - var handler HTTPHandler server := &http.Server{ Addr: addr.String(),

1 0

[stem/master] Add an --exclude-test argument
by atagar＠torproject.org 30 Jan '20

30 Jan '20

commit 886ec10ee51d63fba76c7f3a21d8b73208858ea6 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 30 15:49:36 2020 -0800 Add an --exclude-test argument Implementing a great suggestion from teor for an --exclude-test argument... https://github.com/torproject/stem/issues/53 This can be used to skip both modules... % run_tests.py --unit --exclude-test interpreter.commands [ runs all the tests except the interpreter.commands module ] ... and individual tests... % run_tests.py --unit --test interpreter.commands --exclude-test interpreter.commands.test_events --verbose [ only runs interpreter.commands tests, but skips test_events ] --- run_tests.py | 55 ++++++++++++++++++++++++++++++++++++++++++------------- test/arguments.py | 5 ++++- test/settings.cfg | 7 ++++++- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/run_tests.py b/run_tests.py index d6ced384..91333084 100755 --- a/run_tests.py +++ b/run_tests.py @@ -111,40 +111,57 @@ def log_traceback(sig, frame): os._exit(-1) -def get_unit_tests(module_prefixes = None): +def get_unit_tests(module_prefixes, exclude): """ Provides the classes for our unit tests. :param list module_prefixes: only provide the test if the module starts with any of these substrings + :param list exclude: test modules explicitly excluded :returns: an **iterator** for our unit tests """ - return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefixes) + return _get_tests(CONFIG['test.unit_tests'].splitlines(), module_prefixes, exclude) -def get_integ_tests(module_prefixes = None): +def get_integ_tests(module_prefixes, exclude): """ Provides the classes for our integration tests. :param list module_prefixes: only provide the test if the module starts with any of these substrings + :param list exclude: test modules explicitly excluded :returns: an **iterator** for our integration tests """ - return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefixes) + return _get_tests(CONFIG['test.integ_tests'].splitlines(), module_prefixes, exclude) -def _get_tests(modules, module_prefixes): +def _get_tests(modules, module_prefixes, exclude): for import_name in modules: + cropped_name = test.arguments.crop_module_name(import_name) + cropped_name = cropped_name.rsplit('.', 1)[0] # exclude the class name + + if exclude: + # Check if '--exclude-test' says we should skip this whole module. The + # argument can also skip individual tests, but that must be handled + # elsewhere. + + skip = False + + for exclude_prefix in exclude: + if cropped_name.startswith(exclude_prefix): + skip = True + break + + if skip: + continue + if not module_prefixes: yield import_name else: - cropped_name = test.arguments.crop_module_name(import_name) - cropped_name = cropped_name.rsplit('.', 1)[0] # exclude the class name - for prefix in module_prefixes: if cropped_name.startswith(prefix): yield import_name @@ -258,8 +275,8 @@ def main(): test.output.print_divider('UNIT TESTS', True) error_tracker.set_category('UNIT TEST') - for test_class in get_unit_tests(args.specific_test): - run_result = _run_test(args, test_class, output_filters) + for test_class in get_unit_tests(args.specific_test, args.exclude_test): + run_result = _run_test(args, test_class, args.exclude_test, output_filters) test.output.print_logging(logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) @@ -277,8 +294,8 @@ def main(): println('Running tests...\n', STATUS) - for test_class in get_integ_tests(args.specific_test): - run_result = _run_test(args, test_class, output_filters) + for test_class in get_integ_tests(args.specific_test, args.exclude_test): + run_result = _run_test(args, test_class, args.exclude_test, output_filters) test.output.print_logging(logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) @@ -382,7 +399,7 @@ def _print_static_issues(static_check_issues): println() -def _run_test(args, test_class, output_filters): +def _run_test(args, test_class, exclude, output_filters): # When logging to a file we don't have stdout's test delimiters to correlate # logs with the test that generated them. @@ -423,6 +440,18 @@ def _run_test(args, test_class, output_filters): traceback.print_exc(exc) return None + # check if we should skip any individual tests within this module + + if exclude: + cropped_name = test.arguments.crop_module_name(test_class) + cropped_name = cropped_name.rsplit('.', 1)[0] # exclude the class name + + for prefix in exclude: + if prefix.startswith(cropped_name): + test_name = prefix.split('.')[-1] + + suite._tests = list(filter(lambda test: test.id().split('.')[-1] != test_name, suite._tests)) + test_results = io.StringIO() run_result = stem.util.test_tools.TimedTestRunner(test_results, verbosity = 2).run(suite) diff --git a/test/arguments.py b/test/arguments.py index 65434b8b..d0f0dc3f 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -27,6 +27,7 @@ DEFAULT_ARGS = { 'run_unit': False, 'run_integ': False, 'specific_test': [], + 'exclude_test': [], 'logging_runlevel': None, 'logging_path': None, 'tor_path': 'tor', @@ -38,7 +39,7 @@ DEFAULT_ARGS = { } OPT = 'auit:l:qvh' -OPT_EXPANDED = ['all', 'unit', 'integ', 'targets=', 'test=', 'log=', 'log-file=', 'tor=', 'quiet', 'verbose', 'help'] +OPT_EXPANDED = ['all', 'unit', 'integ', 'targets=', 'test=', 'exclude-test=', 'log=', 'log-file=', 'tor=', 'quiet', 'verbose', 'help'] def parse(argv): @@ -105,6 +106,8 @@ def parse(argv): args['attribute_targets'] = attribute_targets elif opt == '--test': args['specific_test'].append(crop_module_name(arg)) + elif opt == '--exclude-test': + args['exclude_test'].append(crop_module_name(arg)) elif opt in ('-l', '--log'): arg = arg.upper() diff --git a/test/settings.cfg b/test/settings.cfg index 9c746234..1ec8176e 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -68,7 +68,6 @@ msg.help | -a, --all runs unit, integ, and style checks (same as '-ui') | -u, --unit runs unit tests | -i, --integ runs integration tests -| --test TEST_NAME only run tests with this in the module name | | -t, --target TARGET comma separated list of integ targets (see below) | --tor PATH custom tor binary to run testing against @@ -77,6 +76,9 @@ msg.help | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --log-file PATH logs to this file, otherwise logging is to stdout | +| --test TEST_NAME only run this test or or test module +| --exclude-test TEST_NAME skip this test or test module +| | -q, --quiet only present failures | -v, --verbose provides additional test output | -h, --help presents this help @@ -92,6 +94,9 @@ msg.help | run_tests.py --integ --test test.integ.util | Only run integration tests for the util modules. | +| run_tests.py --unit --test interpreter.commands --exclude-test interpreter.commands.test_events --verbose +| Only run interpreter.commands tests, but skip test_events. +| | Integration targets: |

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 30 Jan '20

30 Jan '20

commit 6e7e3f355502842f60c8eb161a0e0b850ea7e4e5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 30 23:15:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ja.po | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index c108182cdc..32460745d6 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -668,7 +668,7 @@ msgstr "＃ CPU" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "* Any modern CPU should be fine." -msgstr "＃ CPU" +msgstr "・最新のCPUである必要はありません。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -677,40 +677,42 @@ msgid "" "performance and allow for up to about ~400-450 Mbps in each direction on a " "single tor instance on modern CPUs)." msgstr "" +"・AESNIをサポートするCPUを使用することをお勧めします（これにより、パフォーマンスが向上し、最新のCPUの単一のtorインスタンスで各方向で最大約400～450" +" Mbpsが可能になります）。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "If the file /proc/cpuinfo contains the word aes your CPU has support for " "AES-NI." -msgstr "" +msgstr "「/proc/cpuinfo」ファイルに「aes」という単語が含まれている場合、CPUはAES-NIをサポートしています。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Uptime" -msgstr "" +msgstr "＃稼働時間" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "Tor has no hard uptime requirement but if your relay is not running for more" " than 2 hours a day its usefulness is limited." -msgstr "" +msgstr "Torにはハードアップタイムの要件はありませんが、リレーが1日2時間以上動作していない場合、その有用性は制限されます。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Ideally the relay runs on a server which runs 24/7." -msgstr "" +msgstr "リレーは年中無休で稼働するサーバー上で稼働しているのが理想的です。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Reboots and tor daemon restarts are fine." -msgstr "" +msgstr "再起動やTorデーモンの再起動をする場合は問題ありません。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Tor Version" -msgstr "" +msgstr "＃Torバージョン" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -720,11 +722,12 @@ msgid "" " insecure. Relays that attempt to downgrade to an insecure version will be " "rejected from the network automatically." msgstr "" +"セキュリティ上の理由から、TorリレーをしているホストのTorは、Torのバージョンを、サポートされているバージョンからサポートされていないバージョンにダウングレードしないでください。一部のサポートされていないバージョンは安全ではありません。安全でないバージョンにダウングレードしようとするリレーは、Torネットワークから自動的に拒否されます。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.title) msgid "Types of relays on the Tor network" -msgstr "" +msgstr "Torネットワーク上のリレーの種類" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.subtitle) @@ -732,44 +735,45 @@ msgid "" "Bridges, guards, middle relays, and exits all serve important functions in " "the Tor network. Learn about the different relays you can run." msgstr "" +"ブリッジ、ガード、中間リレー、および出口はすべて、Torネットワークで重要な機能を果たします。実行できるさまざまなリレーについて説明します。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "" "All nodes are important, but they have different technical requirements and " "legal implications." -msgstr "" +msgstr "すべてのノードは重要ですが、技術的な要件と法的意味は異なります。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "" "Understanding the different kinds of nodes is the first step to learning " "which one is right for you." -msgstr "" +msgstr "さまざまな種類のノードを理解することが、どのノードが適切かを知るための最初のステップです。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "# Guard and middle relay" -msgstr "" +msgstr "＃ガードリレーおよび中間リレー" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "(also known as non-exit relays)" -msgstr "" +msgstr "（非出口リレーとも呼ばれます）" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "" "A guard relay is the first relay in the chain of 3 relays building a Tor " "circuit." -msgstr "" +msgstr "ガードリレーは、Tor回路を構築する3つのリレーのチェーンの最初のリレーです。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "" "A middle relay is neither a guard nor an exit, but acts as the second hop " "between the two." -msgstr "" +msgstr "中間リレーはガードでも出口でもありませんが、2つの間の2番目のホップとして機能します。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -777,11 +781,12 @@ msgid "" "To become a guard, a relay has to be stable and fast (at least 2MByte/s) " "otherwise it will remain a middle relay." msgstr "" +"ガードになるには、リレーは安定していて高速（少なくとも2MByte / s）である必要があります。そうでなければ、リレーは中間リレーになります。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "Guard and middle relays usually do not receive abuse complaints." -msgstr "" +msgstr "ガードリレーと中間リレーは通常、乱用の苦情を受けません。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -790,6 +795,7 @@ msgid "" "blocked by certain services that don't understand how Tor works or " "deliberately want to censor Tor users." msgstr "" +"すべてのリレーは、Torリレーの公開リストにリストされるため、Torの仕組みを理解していない、またはTorユーザーを意図的に検出使用としている特定のサービスによってブロックされる可能性があります。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -798,13 +804,14 @@ msgid "" " consider running a bridge instead so that your non-Tor traffic doesn't get " "blocked as though it's coming from Tor." msgstr "" +"自宅からリレーを実行していて、静的IPが1つある場合は、代わりにブリッジを実行して、非TorトラフィックがTorからのトラフィックのようにブロックされないようにすることを推奨します。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "" "If you have a dynamic IP address or multiple static IPs, this isn't as much " "of an issue." -msgstr "" +msgstr "動的IPアドレスまたは複数の静的IPがある場合、これはそれほど大きな問題ではありません。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -813,23 +820,24 @@ msgid "" "usage can be highly customized in the tor configuration (will be covered in " "more detail later in this guide)." msgstr "" +"非出口Torリレーは、最小限の保守作業を必要とし、帯域幅の使用はTor構成で高度にカスタマイズできます（このガイドで後ほど詳しく説明します）。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "" "The so called \"exit policy\" of the relay decides if it is a relay allowing" " clients to exit or not." -msgstr "" +msgstr "リレーのいわゆる「出口ポリシー」は、それがクライアントが終了することを許可するリレーであるかどうかを決定します。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "A non-exit relay does not allow exiting in its exit policy." -msgstr "" +msgstr "非出口リレーは、その出口ポリシーでの出口を許可しません。" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) msgid "# Exit relay" -msgstr "" +msgstr "＃出口リレー" #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 30 Jan '20

30 Jan '20

commit 6f50f1ef559214125ca7070a8137c68b114f1960 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 30 22:45:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ja.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index cfbfd5f854..c108182cdc 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -629,46 +629,46 @@ msgstr "＃メモリ必要な条件" #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "* A <40 Mbit/s non-exit relay should have at least 512 MB of RAM available." -msgstr "" +msgstr "・40 Mbit/s未満の非終了リレーには、少なくとも512MBのRAMが必要です。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "* A non-exit relay faster than 40 Mbit/s should have at least 1 GB of RAM." -msgstr "" +msgstr "・40 Mbit/sより速い非終了リレーには、少なくとも1 GBのRAMが必要です。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "* On an exit relay we recommend at least 1.5 GB of RAM per tor instance." -msgstr "" +msgstr "・出口リレーでは、Torのインスタンスごとに少なくとも1.5 GBのRAMを推奨します。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# Disk Storage" -msgstr "" +msgstr "＃ディスクストレージ" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "Tor does not need much disk storage." -msgstr "" +msgstr "Torは、多くのディスクストレージを必要としません。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "" "A typical Tor relay needs less than 200 MB for Tor related data (in addition" " to the operating system itself)." -msgstr "" +msgstr "典型的なTorリレーは、Tor関連データ（OS自体に加えて）に200 MB未満を必要とします。" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "# CPU" -msgstr "" +msgstr "＃ CPU" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) msgid "* Any modern CPU should be fine." -msgstr "" +msgstr "＃ CPU" #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)

1 0

[stem/master] Ignore BrokenPipeError when closing
by atagar＠torproject.org 30 Jan '20

30 Jan '20

commit fb40101e44a9c9275187050d827f0b0bce7a56b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 30 14:21:38 2020 -0800 Ignore BrokenPipeError when closing Our jenkins tests our failing pretty routinely with python 3.7. It turns out that this is my bad - unlike python 2.x the socket module frequently (but inconsistently) raises a BrokenPipeError when closing a file based socket. Why would anyone care that the socket they're closing isn't working? That's... kinda the point. Oh well - ignoring these exceptions. --- docs/change_log.rst | 4 ++++ stem/socket.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 53706a74..792baaca 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -46,6 +46,10 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **Controller** + + * Socket based control connections often raised BrokenPipeError when closed + .. _version_1.8: Version 1.8 (December 29th, 2019) diff --git a/stem/socket.py b/stem/socket.py index 4ab534b8..5da02a0c 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -207,7 +207,10 @@ class BaseSocket(object): self._socket.close() if self._socket_file: - self._socket_file.close() + try: + self._socket_file.close() + except BrokenPipeError: + pass self._socket = None self._socket_file = None

1 0

[tor/master] Use print() function in both Python 2 and Python 3
by dgoulet＠torproject.org 30 Jan '20

30 Jan '20

commit 3208a74f906c116e93074c6ed0559df1cbfe58d1 Author: cclauss <cclauss(a)me.com> Date: Tue Jan 28 01:38:54 2020 +0100 Use print() function in both Python 2 and Python 3 --- contrib/client-tools/tor-resolve.py | 10 +++++----- scripts/codegen/gen_server_ciphers.py | 14 +++++++------- scripts/codegen/get_mozilla_ciphers.py | 8 ++++---- scripts/codegen/makedesc.py | 15 ++++++++++----- scripts/maint/format_changelog.py | 2 +- scripts/maint/locatemissingdoxygen.py | 6 +++--- scripts/maint/redox.py | 17 +++++++++++------ src/ext/ed25519/ref10/base.py | 14 +++++++------- src/ext/ed25519/ref10/base2.py | 10 +++++----- src/ext/ed25519/ref10/d.py | 2 +- src/ext/ed25519/ref10/d2.py | 2 +- src/ext/ed25519/ref10/sqrtm1.py | 2 +- src/test/ed25519_exts_ref.py | 20 ++++++++++---------- 13 files changed, 66 insertions(+), 56 deletions(-) diff --git a/contrib/client-tools/tor-resolve.py b/contrib/client-tools/tor-resolve.py index 593efc97d..356219371 100755 --- a/contrib/client-tools/tor-resolve.py +++ b/contrib/client-tools/tor-resolve.py @@ -87,7 +87,7 @@ def parseHostAndPort(h): try: port = int(h[i+1:]) except ValueError: - print "Bad hostname %r"%h + print("Bad hostname %r"%h) sys.exit(1) elif h: try: @@ -123,15 +123,15 @@ def resolve(hostname, sockshost, socksport, socksver=4, reverse=0): return None answer += more result = parse(answer) - print "Got answer",result + print("Got answer",result) m = s.recv(1) if m: - print "Got extra data too: %r"%m + print("Got extra data too: %r"%m) return result if __name__ == '__main__': if len(sys.argv) not in (2,3,4): - print "Syntax: resolve.py [-4|-5] hostname [sockshost:socksport]" + print("Syntax: resolve.py [-4|-5] hostname [sockshost:socksport]") sys.exit(0) socksver = 4 reverse = 0 @@ -146,7 +146,7 @@ if __name__ == '__main__': break if len(sys.argv) >= 4: - print "Syntax: resolve.py [-x] [-4|-5] hostname [sockshost:socksport]" + print("Syntax: resolve.py [-x] [-4|-5] hostname [sockshost:socksport]") sys.exit(0) if len(sys.argv) == 3: sh,sp = parseHostAndPort(sys.argv[2]) diff --git a/scripts/codegen/gen_server_ciphers.py b/scripts/codegen/gen_server_ciphers.py index dd295b7f7..3b7795224 100755 --- a/scripts/codegen/gen_server_ciphers.py +++ b/scripts/codegen/gen_server_ciphers.py @@ -101,7 +101,7 @@ def parse_cipher(ciph): fwsec, = m.groups() return Ciphersuite(ciph, fwsec, "CHACHA20", "256", "POLY1305", "n/a") - print "/* Couldn't parse %s ! */"%ciph + print("/* Couldn't parse %s ! */"%ciph) return None @@ -125,12 +125,12 @@ for c in ALL_CIPHERS: colon = ' ":"' if c.name in MANDATORY: - print "%s/* Required */"%indent - print '%s%s%s'%(indent,c.name,colon) + print("%s/* Required */"%indent) + print('%s%s%s'%(indent,c.name,colon)) else: - print "#ifdef %s"%c.name - print '%s%s%s'%(indent,c.name,colon) - print "#endif" + print("#ifdef %s"%c.name) + print('%s%s%s'%(indent,c.name,colon)) + print("#endif") -print '%s;'%indent +print('%s;'%indent) diff --git a/scripts/codegen/get_mozilla_ciphers.py b/scripts/codegen/get_mozilla_ciphers.py index d149c71c2..165105736 100755 --- a/scripts/codegen/get_mozilla_ciphers.py +++ b/scripts/codegen/get_mozilla_ciphers.py @@ -20,7 +20,7 @@ import re import sys if len(sys.argv) != 3: - print >>sys.stderr, "Syntax: get_mozilla_ciphers.py <firefox-source-dir> <openssl-source-dir>" + print("Syntax: get_mozilla_ciphers.py <firefox-source-dir> <openssl-source-dir>", file=sys.stderr) sys.exit(1) ff_root = sys.argv[1] @@ -176,13 +176,13 @@ for fl in oSSLinclude: fp.close() # Now generate the output. -print """\ +print("""\ /* This is an include file used to define the list of ciphers clients should * advertise. Before including it, you should define the CIPHER and XCIPHER * macros. * * This file was automatically generated by get_mozilla_ciphers.py. - */""" + */""") # Go in order by the order in CipherPrefs for firefox_macro in firefox_ciphers: @@ -215,4 +215,4 @@ for firefox_macro in firefox_ciphers: #else XCIPHER(%(hex)s, %(macro)s) #endif""" % format - print res + print(res) diff --git a/scripts/codegen/makedesc.py b/scripts/codegen/makedesc.py index 7d8177f46..4c3cfdb07 100644 --- a/scripts/codegen/makedesc.py +++ b/scripts/codegen/makedesc.py @@ -30,6 +30,11 @@ import slow_ed25519 import slownacl_curve25519 import ed25519_exts_ref +try: + xrange # Python 2 +except NameError: + xrange = range # Python 3 + # Pull in the openssl stuff we need. crypt = ctypes.CDLL(ctypes.util.find_library('crypto')) @@ -303,10 +308,10 @@ def signdesc(body, args_out=None): return body.rstrip() def print_c_string(ident, body): - print "static const char %s[] =" % ident + print("static const char %s[] =" % ident) for line in body.split("\n"): - print ' "%s\\n"' %(line) - print " ;" + print(' "%s\\n"' %(line)) + print(" ;") def emit_ri(name, body): info = OnDemandKeys() @@ -320,8 +325,8 @@ def emit_ei(name, body): body = info.sign_desc(body) print_c_string("EX_EI_%s"%name.upper(), body) - print 'const char EX_EI_{NAME}_FP[] = "{d.RSA_FINGERPRINT_NOSPACE}";'.format( - d=info, NAME=name.upper()) + print('const char EX_EI_{NAME}_FP[] = "{d.RSA_FINGERPRINT_NOSPACE}";'.format( + d=info, NAME=name.upper())) print_c_string("EX_EI_%s_KEY"%name.upper(), info.RSA_IDENTITY) def analyze(s): diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 5f04a44ef..32085c360 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -291,7 +291,7 @@ class ChangeLog(object): self.curgraf.append(line) else: - assert "This" is "unreachable" + assert "This" is "unreachable" # noqa: F632 def lint_head(self, line, head): m = re.match(r'^ *o ([^\(]+)((?:\([^\)]+\))?):', head) diff --git a/scripts/maint/locatemissingdoxygen.py b/scripts/maint/locatemissingdoxygen.py index 9e58bd347..773397735 100755 --- a/scripts/maint/locatemissingdoxygen.py +++ b/scripts/maint/locatemissingdoxygen.py @@ -34,10 +34,10 @@ def buildWarnings(): def count(fn): if os.path.abspath(fn) not in warnings: - print "0\t%s"%fn + print("0\t%s"%fn) else: n = len(warnings[os.path.abspath(fn)]) - print "%d\t%s"%(n,fn) + print("%d\t%s"%(n,fn)) def getIndentation(line): s = line.lstrip() @@ -67,7 +67,7 @@ def annotate(filename): if __name__ == '__main__': if len(sys.argv) == 1: - print "Usage: locatemissingdoxygen.py [-A] filename... <doxygen_log" + print("Usage: locatemissingdoxygen.py [-A] filename... <doxygen_log") sys.exit(1) buildWarnings() if sys.argv[1] == '-A': diff --git a/scripts/maint/redox.py b/scripts/maint/redox.py index 171c6d969..3ad3e3f1b 100755 --- a/scripts/maint/redox.py +++ b/scripts/maint/redox.py @@ -37,6 +37,11 @@ from __future__ import unicode_literals import re import sys +try: + xrange # Python 2 +except NameError: + xrange = range # Python 3 + # Which files should we ignore warning from? Mostly, these are external # files that we've snarfed in from somebody else, whose C we do no intend # to document for them. @@ -78,7 +83,7 @@ def parsething(thing): else: m = THING_RE.match(thing) if not m: - print thing, "???? Format didn't match." + print(thing, "???? Format didn't match.") return None, None else: name, tp, parent = m.groups() @@ -155,7 +160,7 @@ def checkf(fn, errs): """ for skip in SKIP_FILES: if fn.endswith(skip): - print "Skipping",fn + print("Skipping",fn) return comments = [] @@ -174,8 +179,8 @@ def checkf(fn, errs): ln = findline(lines, line, name) if ln == None: - print "Couldn't find the definition of %s allegedly on %s of %s"%( - name, line, fn) + print("Couldn't find the definition of %s allegedly on %s of %s"%( + name, line, fn)) else: if hasdocdoc(lines, line, kind): # print "Has a DOCDOC" @@ -220,12 +225,12 @@ def applyComments(fn, entries): outf.write(line) outf.close() - print "Added %s DOCDOCs to %s" %(N, fn) + print("Added %s DOCDOCs to %s" %(N, fn)) e = read() for fn, errs in e.iteritems(): - print `(fn, errs)` + print(repr((fn, errs))) comments = checkf(fn, errs) if comments: applyComments(fn, comments) diff --git a/src/ext/ed25519/ref10/base.py b/src/ext/ed25519/ref10/base.py index 8bfaab056..3d477c5c3 100644 --- a/src/ext/ed25519/ref10/base.py +++ b/src/ext/ed25519/ref10/base.py @@ -56,15 +56,15 @@ def radix255(x): Bi = B for i in range(32): - print "{" + print("{") Bij = Bi for j in range(8): - print " {" - print " {",radix255(Bij[1]+Bij[0]),"}," - print " {",radix255(Bij[1]-Bij[0]),"}," - print " {",radix255(2*d*Bij[0]*Bij[1]),"}," + print(" {") + print(" {",radix255(Bij[1]+Bij[0]),"},") + print(" {",radix255(Bij[1]-Bij[0]),"},") + print(" {",radix255(2*d*Bij[0]*Bij[1]),"},") Bij = edwards(Bij,Bi) - print " }," - print "}," + print(" },") + print("},") for k in range(8): Bi = edwards(Bi,Bi) diff --git a/src/ext/ed25519/ref10/base2.py b/src/ext/ed25519/ref10/base2.py index 5923e43a7..3f8e3d25d 100644 --- a/src/ext/ed25519/ref10/base2.py +++ b/src/ext/ed25519/ref10/base2.py @@ -57,9 +57,9 @@ def radix255(x): Bi = B for i in range(8): - print " {" - print " {",radix255(Bi[1]+Bi[0]),"}," - print " {",radix255(Bi[1]-Bi[0]),"}," - print " {",radix255(2*d*Bi[0]*Bi[1]),"}," - print " }," + print(" {") + print(" {",radix255(Bi[1]+Bi[0]),"},") + print(" {",radix255(Bi[1]-Bi[0]),"},") + print(" {",radix255(2*d*Bi[0]*Bi[1]),"},") + print(" },") Bi = edwards(B,edwards(B,Bi)) diff --git a/src/ext/ed25519/ref10/d.py b/src/ext/ed25519/ref10/d.py index 3fbb17507..5b875de66 100644 --- a/src/ext/ed25519/ref10/d.py +++ b/src/ext/ed25519/ref10/d.py @@ -30,4 +30,4 @@ def radix255(x): return result d = -121665 * inv(121666) -print radix255(d) +print(radix255(d)) diff --git a/src/ext/ed25519/ref10/d2.py b/src/ext/ed25519/ref10/d2.py index 3e533730b..f59a1bc62 100644 --- a/src/ext/ed25519/ref10/d2.py +++ b/src/ext/ed25519/ref10/d2.py @@ -30,4 +30,4 @@ def radix255(x): return result d = -121665 * inv(121666) -print radix255(d*2) +print(radix255(d*2)) diff --git a/src/ext/ed25519/ref10/sqrtm1.py b/src/ext/ed25519/ref10/sqrtm1.py index a276d4e67..df9f26ee1 100644 --- a/src/ext/ed25519/ref10/sqrtm1.py +++ b/src/ext/ed25519/ref10/sqrtm1.py @@ -30,4 +30,4 @@ def radix255(x): return result I = expmod(2,(q-1)/4,q) -print radix255(I) +print(radix255(I)) diff --git a/src/test/ed25519_exts_ref.py b/src/test/ed25519_exts_ref.py index 658f7cde1..ae537ff15 100644 --- a/src/test/ed25519_exts_ref.py +++ b/src/test/ed25519_exts_ref.py @@ -152,7 +152,7 @@ class SelfTest(unittest.TestCase): # Check that identities match assert(identity == identity2) # Check that identity is the point (0,1) - assert(identity == [0L,1L]) + assert(identity == [0,1]) # Check identity element: a*E = E, where a is a random scalar scalar = random_scalar(os.urandom) @@ -186,22 +186,22 @@ BLINDING_PARAMS = [ PREFIX = "ED25519_" def writeArray(name, array): - print "static const char *{prefix}{name}[] = {{".format( - prefix=PREFIX,name=name) + print("static const char *{prefix}{name}[] = {{".format( + prefix=PREFIX,name=name)) for a in array: h = binascii.b2a_hex(a) if len(h) > 70: h1 = h[:70] h2 = h[70:] - print ' "{0}"\n "{1}",'.format(h1,h2) + print(' "{0}"\n "{1}",'.format(h1,h2)) else: - print ' "{0}",'.format(h) - print "};\n" + print(' "{0}",'.format(h)) + print("};\n") def comment(text, initial="/**"): - print initial - print textwrap.fill(text,initial_indent=" * ",subsequent_indent=" * ") - print " */" + print(initial) + print(textwrap.fill(text,initial_indent=" * ",subsequent_indent=" * ")) + print(" */") def makeTestVectors(): comment("""Test vectors for our ed25519 implementation and related @@ -257,7 +257,7 @@ def makeTestVectors(): if __name__ == '__main__': import sys if len(sys.argv) == 1 or sys.argv[1] not in ("SelfTest", "MakeVectors"): - print "You should specify one of 'SelfTest' or 'MakeVectors'" + print("You should specify one of 'SelfTest' or 'MakeVectors'") sys.exit(1) if sys.argv[1] == 'SelfTest': unittest.main()

1 0