August 2016 - tor-commits - lists.torproject.org

[nyx/master] Standardize on integer division
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit 168561c5ad3584212f8cfd993f082fbb0da4d7dd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:11:30 2016 -0700 Standardize on integer division Python 3.x changes to do float division. Using '//' to explicitly do integer division. This changes testing failures as follows... from: FAILED (failures=3, errors=15) to: FAILED (failures=8, errors=5) --- nyx/panel/graph.py | 8 ++++---- nyx/popups.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 492037e..250c0e6 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -648,7 +648,7 @@ def _x_axis_labels(interval, columns): interval_spacing = 10 if columns >= WIDE_LABELING_GRAPH_COL else 5 previous_units, decimal_precision = None, 0 - for i in range((columns - 4) / interval_spacing): + for i in range((columns - 4) // interval_spacing): x = (i + 1) * interval_spacing time_label = str_tools.time_label(x * interval_sec, decimal_precision) @@ -676,15 +676,15 @@ def _y_axis_labels(subgraph_height, data, min_bound, max_bound): subgraph_height - 1: data.y_axis_label(min_bound), } - ticks = (subgraph_height - 5) / 2 + ticks = (subgraph_height - 5) // 2 for i in range(ticks): row = subgraph_height - (2 * i) - 5 - if subgraph_height % 2 == 0 and i >= (ticks / 2): + if subgraph_height % 2 == 0 and i >= (ticks // 2): row -= 1 # make extra gap be in the middle when we're an even size - val = (max_bound - min_bound) * (subgraph_height - row - 3) / (subgraph_height - 3) + val = (max_bound - min_bound) * (subgraph_height - row - 3) // (subgraph_height - 3) if val not in (min_bound, max_bound): y_axis_labels[row + 2] = data.y_axis_label(val) diff --git a/nyx/popups.py b/nyx/popups.py index 8cadf05..e9fa1db 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -233,7 +233,7 @@ def show_descriptor(fingerprint, color, is_close_key): for line in lines: width = min(screen_size.width, max(width, len(line) + line_number_width + 5)) - height += len(line) / (screen_size.width - line_number_width - 5) # extra lines due to text wrap + height += len(line) // (screen_size.width - line_number_width - 5) # extra lines due to text wrap with nyx.curses.CURSES_LOCK: nyx.curses.draw(lambda subwindow: subwindow.addstr(0, 0, ' ' * 500), top = _top(), height = 1) # hides title below us @@ -454,7 +454,7 @@ def select_event_types(initial_selection): with nyx.curses.CURSES_LOCK: while True: - nyx.curses.draw(_render, top = _top(), width = 80, height = (len(events) / 3) + 10) + nyx.curses.draw(_render, top = _top(), width = 80, height = (len(events) // 3) + 10) key = nyx.curses.key_input() if key.match('up'):

1 0

[nyx/master] Unable to index into dict keys/values
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit a272168174e2dc2c57b2a027c02ebf87276aa660 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:22:08 2016 -0700 Unable to index into dict keys/values The dict's keys() and values() methods provide iterators which we can't index into... TypeError: 'dict_values' object does not support indexing --- nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 3a4a67b..d67afae 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -58,7 +58,7 @@ class ConfigEntry(object): self.name = name self.value_type = value_type self.manual = manual.config_options.get(name, stem.manual.ConfigOption(name)) - self._index = manual.config_options.keys().index(name) if name in manual.config_options else 99999 + self._index = list(manual.config_options.keys()).index(name) if name in manual.config_options else 99999 def value(self): """ diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index d30742f..16175d9 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -598,7 +598,7 @@ def _draw_details(subwindow, selected): subwindow.addstr(2, 3, 'No consensus data found', *attr) elif len(matches) == 1 or selected.connection.remote_port in matches: controller = tor_controller() - fingerprint = matches.values()[0] if len(matches) == 1 else matches[selected.connection.remote_port] + fingerprint = list(matches.values())[0] if len(matches) == 1 else matches[selected.connection.remote_port] router_status_entry = controller.get_network_status(fingerprint, None) subwindow.addstr(15, 2, 'fingerprint: %s' % fingerprint, *attr)

1 0

[nyx/master] Use items() rather than iteritems()
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit fd9c4549cf97e9476a4a7262f9be61e01170f76e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:15:14 2016 -0700 Use items() rather than iteritems() Python 3.x dropped the iteritems() method since items() now provides an iterator... AttributeError: 'dict' object has no attribute 'iteritems' --- nyx/popups.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index e9fa1db..ecea237 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -147,13 +147,13 @@ def show_counts(title, counts, fill_char = ' '): subwindow.addstr(0, 0, title, HIGHLIGHT) graph_width = subwindow.width - key_width - val_width - 11 # border, extra spaces, and percentage column - sorted_counts = sorted(counts.iteritems(), key = operator.itemgetter(1), reverse = True) + sorted_counts = sorted(counts.items(), key = operator.itemgetter(1), reverse = True) for y, (k, v) in enumerate(sorted_counts): label = '%s %s (%-2i%%)' % (k.ljust(key_width), str(v).rjust(val_width), v * 100 / value_total) x = subwindow.addstr(2, y + 1, label, GREEN, BOLD) - for j in range(graph_width * v / value_total): + for j in range(graph_width * v // value_total): subwindow.addstr(x + j + 1, y + 1, fill_char, RED, HIGHLIGHT) subwindow.addstr(2, subwindow.height - 2, 'Press any key...')

1 0

[nyx/master] Python 3.x compatibility
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit ca2a38500b964dfdbd5e4645c4e0a44fcab3f059 Merge: 290f1a9 d7e9cd9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 11:27:21 2016 -0700 Python 3.x compatibility Don't get too excited. While tests pass and I can now run nyx under python 3.x there's no doubt some issues I haven't uncovered yet. :P nyx/curses.py | 4 +-- nyx/panel/config.py | 4 +-- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 10 ++++---- nyx/panel/log.py | 6 ++--- nyx/panel/torrc.py | 2 +- nyx/popups.py | 20 +++++++-------- test/popups.py | 68 ++++++++++++++++++++++++------------------------- 8 files changed, 58 insertions(+), 58 deletions(-)

1 0

[nyx/master] torrc panel stacktraced due to filter()
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit d7e9cd9eea9c106ea074f6fb72e444de72d299ed Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:35:16 2016 -0700 torrc panel stacktraced due to filter() Anther spot where we need to standardize our use of filter(). This one manifested as a stacktrace when viewing the torrc panel with... AttributeError: 'filter' object has no attribute 'strip' --- nyx/panel/torrc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index d5e890e..eeb08e6 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -25,7 +25,7 @@ def _read_torrc(path): with open(path) as torrc_file: for line in torrc_file.readlines(): line = line.replace('\t', ' ').replace('\xc2', "'").rstrip() - contents.append(filter(lambda char: char in string.printable, line)) + contents.append(''.join(filter(lambda char: char in string.printable, line))) return contents

1 0

[nyx/master] Graph panel stacktrace due to float width
by atagar＠torproject.org 28 Aug '16

28 Aug '16

commit 10c791fc665ae0f640ccbb97182aacd16071b24d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 28 10:32:50 2016 -0700 Graph panel stacktrace due to float width Ewww I suspect we're gonna be stumbling on these for a while. This one manifests as... TypeError: slice indices must be integers or None or have an __index__ method --- nyx/panel/graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 250c0e6..70b8b60 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -567,7 +567,7 @@ class GraphPanel(nyx.panel.Panel): stat = type(stat)(stat) # clone the GraphCategory subgraph_height = self._graph_height + 2 # graph rows + header + x-axis label - subgraph_width = min(subwindow.width / 2, CONFIG['features.graph.max_width']) + subgraph_width = min(subwindow.width // 2, CONFIG['features.graph.max_width']) interval, bounds_type = self._update_interval, self._bounds_type subwindow.addstr(0, 0, stat.title(subwindow.width), HIGHLIGHT)

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 28 Aug '16

28 Aug '16

commit 4c365858018dcb86db24d661031d67d05b7e47c8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 28 17:16:30 2016 +0000 Update translations for torbutton-torbuttonproperties --- lt/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/torbutton.properties b/lt/torbutton.properties index 7ab7f61..318ea84 100644 --- a/lt/torbutton.properties +++ b/lt/torbutton.properties @@ -11,7 +11,7 @@ torbutton.panel.tooltip.enabled = Paspauskite kad atjungti Tor torbutton.panel.label.disabled = Tor atjungtas torbutton.panel.label.enabled = Tor įgalintas extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.title = Atsisiųsti išorinį failo tipą? torbutton.popup.external.app = Tor Browser negali atverti šio failo. Juma teks atverti jį, naudojant kitą programą.\n\n torbutton.popup.external.note = Kai kurie failų tipai, gali priversti programas prisijungti prie interneto ne per Tor.\n\n torbutton.popup.external.suggest = Saugumo sumetimais, parsisiųstus failus derėtų atverti, atsijungus nuo interneto arba naudojant Tor Live CD tokį kaip Tails.\n @@ -25,7 +25,7 @@ torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't t torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.never_ask_again = Daugiau nebeklausti torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out!

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 28 Aug '16

28 Aug '16

commit 9204493902bc5bae4d248844c9d7c935a44c93fc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 28 16:18:04 2016 +0000 Update translations for tor-messenger-prefsdtd --- pt/prefs.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt/prefs.dtd b/pt/prefs.dtd index 9e64e21..3f374a7 100644 --- a/pt/prefs.dtd +++ b/pt/prefs.dtd @@ -14,9 +14,9 @@ <!ENTITY prefs.emptyAccountList "Sem contas configuradas"> <!ENTITY prefs.generate "Gerar"> <!ENTITY prefs.coniksConnection "Connection"> -<!ENTITY prefs.coniksServerAddress "Server Address"> -<!ENTITY prefs.coniksServerPort "Port"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> +<!ENTITY prefs.coniksServerAddress "Endereço do Servidor"> +<!ENTITY prefs.coniksServerPort "Porta"> +<!ENTITY prefs.coniksAccountPolicy "Politica de Conta"> +<!ENTITY prefs.coniksPoliciesForAccount "Políticas para a conta:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[tor-messenger-build/master] Add a patch for bugzilla 1298574
by arlo＠torproject.org 28 Aug '16

28 Aug '16

commit 22893766980774cd2f22a405a978b4f70abb3075 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Aug 28 09:06:07 2016 -0700 Add a patch for bugzilla 1298574 --- projects/instantbird/bug-1298574.patch | 47 ++++++++++++++++++++++++++++++++++ projects/instantbird/config | 1 + 2 files changed, 48 insertions(+) diff --git a/projects/instantbird/bug-1298574.patch b/projects/instantbird/bug-1298574.patch new file mode 100644 index 0000000..b0a4ae2 --- /dev/null +++ b/projects/instantbird/bug-1298574.patch @@ -0,0 +1,47 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1472399861 25200 +# Sun Aug 28 08:57:41 2016 -0700 +# Branch THUNDERBIRD4530_2016082513_RELBRANCH +# Node ID 69baf6e1ea1e4c8f4ddf719bff6b542869a99a23 +# Parent f4a50139b69d93674a2fa55b51ab843a66d3fae2 +Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth + * This prevents an infinite req / res cycle. + +--HG-- +extra : amend_source : fb94df25b6157ec06dcf8f57b66a484aee243a28 + +diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm +--- a/chat/protocols/xmpp/xmpp.jsm ++++ b/chat/protocols/xmpp/xmpp.jsm +@@ -2231,16 +2231,30 @@ var XMPPAccountPrototype = { + if (this._userVCard) { + let binval = this._userVCard.getElement(["PHOTO", "BINVAL"]); + if (binval && binval.children.length) { + binval = binval.children[0]; + binval.text = binval.text.replace(/[^A-Za-z0-9\+\/\=]/g, "") + .replace(/.{74}/g, "$&\n"); + } + } ++ else { ++ // Downloading the vCard failed. ++ if (this.handleErrors({ ++ itemNotFound: () => false, // OK, no vCard exists yet. ++ default: () => true ++ })(aStanza)) { ++ this.WARN("Unexpected error retrieving the user's vcard, " + ++ "so we won't attempt to set it either."); ++ return; ++ } ++ // Set this so that we don't get into an infinite loop trying to download ++ // the vcard again. The check in sendVCard is for hasOwnProperty. ++ this._userVCard = null; ++ } + this._sendVCard(); + }, + + _cachingUserIcon: false, + _cacheUserIcon: function() { + if (this._cachingUserIcon) + return; + diff --git a/projects/instantbird/config b/projects/instantbird/config index a1e2098..1223804 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -69,6 +69,7 @@ input_files: - filename: xmppRegister.js - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch + - filename: bug-1298574.patch - filename: trac-16489.patch - filename: trac-17896.patch - filename: trac-17494.patch

1 0

[metrics-tasks/master] Tweak code for web logs analysis (#20008).
by karsten＠torproject.org 28 Aug '16

28 Aug '16

commit f4f909d227732fe3ba14da17436e3fc3065f70f4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Aug 28 14:38:02 2016 +0200 Tweak code for web logs analysis (#20008). --- task-20008/run.sh | 2 +- task-20008/webstats.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/task-20008/run.sh b/task-20008/run.sh index 4039ee6..883b0c3 100755 --- a/task-20008/run.sh +++ b/task-20008/run.sh @@ -3,6 +3,6 @@ date rm -rf bin mkdir -p bin/ javac -d bin/ -cp lib/commons-compress-1.9.jar:lib/postgresql-jdbc3-9.2.jar:lib/xz-1.5.jar src/Importer.java -java -cp bin:lib/commons-compress-1.9.jar:lib/postgresql-jdbc3-9.2.jar:lib/xz-1.5.jar Importer webstats.torproject.org >> log +java -cp bin:lib/commons-compress-1.9.jar:lib/postgresql-jdbc3-9.2.jar:lib/xz-1.5.jar Importer webstats.torproject.org >> log 2>&1 date diff --git a/task-20008/webstats.sql b/task-20008/webstats.sql index 91a36b6..079397d 100644 --- a/task-20008/webstats.sql +++ b/task-20008/webstats.sql @@ -17,9 +17,9 @@ CREATE TABLE resources ( ); CREATE TABLE requests ( - file_id integer REFERENCES files (file_id), + file_id integer REFERENCES files (file_id) NOT NULL, method method NOT NULL, - resource_id integer REFERENCES resources (resource_id), + resource_id integer REFERENCES resources (resource_id) NOT NULL, response_code smallint NOT NULL, count integer NOT NULL, total_bytes_sent bigint NOT NULL,

1 0