tor-commits March 2015

tor-commits@lists.torproject.org

23 participants
1889 discussions

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit d26b3289684fff6da436a9543e48a85375870f12 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 22:45:34 2015 +0000 Update translations for tails-misc --- ar.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ar.po b/ar.po index 324edbc..087b9a2 100644 --- a/ar.po +++ b/ar.po @@ -10,6 +10,7 @@ # 0xidz <ghoucine(a)gmail.com>, 2014 # KACIMI LAMINE <k_lamine27(a)yahoo.fr>, 2015 # Matt Santy <matt_santy(a)hotmail.com>, 2013 +# maya <mayamsh(a)gmail.com>, 2015 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013 # Osama H. Qasho' <osamah_owis(a)windowslive.com>, 2014 # Osama M. Mneina <o.mneina(a)gmail.com>, 2014 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-03-04 16:10+0000\n" -"Last-Translator: KACIMI LAMINE <k_lamine27(a)yahoo.fr>\n" +"PO-Revision-Date: 2015-03-23 22:45+0000\n" +"Last-Translator: maya <mayamsh(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +54,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "" +msgstr "<h1>ساعدنا لإصلاح المشكلة!</h1>\nاقرأ <a href=\"%s\">الإرشادات الخاصة بالتبليغ عن الأخطاء</a>.\nلحماية خصوصيتك، قم بتعبئة البيانات المطلوبة فقط لاغير!\n\n<h2>توضيح حول تزويدنا بعنوان بريدك الالكتروني</h2>\n\nسنقوم باستخدام بريدك الالكتروني للتواصل معك من أجل استيضاح المشكلة بشكل أفضل، وهو مطلوب لأغلب تقارير الأخطاء حيث أنه من غير الممكن متابعة تقارير الأخطاء التي ترسل من دون أية معلومات اتصال.\nمن ناحية أخرى، يجب التنويه بأن تضمين البريد الالكتروني يسمح لبعض الجهات تأكيد استخدامك لـ تيلز، كمزود خدمة البريد الالكتروني أو مزود خدمة الانتر نت على سبيل المثال. \n\n\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" @@ -298,7 +299,7 @@ msgstr "تم التحديث بنجاح." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "جاري تزامن ساعة النظام." +msgstr "جاري مزامنة ساعة النظام." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid ""

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit fcecd004c3c98e03fec3b4603f875a7ef20dbc97 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 21:45:47 2015 +0000 Update translations for torbutton-torbuttondtd --- hu/torbutton.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd index 59b0e13..90000b7 100644 --- a/hu/torbutton.dtd +++ b/hu/torbutton.dtd @@ -163,8 +163,8 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "A szkriptek néhány oldalon lassabban futnak."> +<!ENTITY torbutton.prefs.sec_jar_desc "Távoli JAR fájlok blokkolva."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> @@ -173,8 +173,8 @@ <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG képek letiltva."> +<!ENTITY torbutton.prefs.sec_js_https_desc "A JavaScript alapértelmezésben kikapcsolt minden nem HTTPS oldalra."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "Magas"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites.">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 58d34eb1b297da4a91d96d375a2e880e4b1812a5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 21:45:44 2015 +0000 Update translations for torbutton-torbuttonproperties --- hu/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hu/torbutton.properties b/hu/torbutton.properties index 12b9534..97afa01 100644 --- a/hu/torbutton.properties +++ b/hu/torbutton.properties @@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Tor bekapcsolása torbutton.button.tooltip.enabled = Tor kikapcsolása torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP cím ismeretlen -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = Onion oldal torbutton.circuit_display.this_browser = Ez a böngésző -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = relé torbutton.circuit_display.tor_bridge = Híd torbutton.circuit_display.unknown_country = Ismeretlen ország torbutton.panel.tooltip.disabled = Kattintson rá a Tor bekapcsolásához @@ -66,7 +66,7 @@ canvas.neverAccessKey=S # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileProblemTitle=%S Profile probléma +profileReadOnly=Nem tudja futtatni a %S -t csak olvasható fájlrendszerről. Kérem másolja %S-t egy másik helyre, mielőtt használja. +profileReadOnlyMac=Nem tudja futtatni a %S -t csak olvasható fájlrendszerről. Kérem másolja %S-t az Asztalra, vagy az Alkalmazások mappába, mielőtt használja. +profileAccessDenied=%S nem rendelkezik jogosultsággal a profil eléréséhez. Kérem állítsa be a fájl rendsze jogosultságokat, majd próbálja újra.

1 0

[webwml/master] Revert "Add new TBB version"
by mikeperry＠torproject.org 23 Mar '15

23 Mar '15

commit 1f90b25bdd0c4ffe2dc8a02ad3ed2a955a9a6908 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 23 14:13:32 2015 -0700 Revert "Add new TBB version" This reverts commit aa6fc45896e7d0740351156a23b87e11b9c02146. This was done out of order. The release process notes specify that this version update is to happen after the bundles are uploaded, but before the incrementals and blog post go live. Doing this in other orders breaks things. In this case, we broke Tor Browser Launcher. --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index e92c003..3d43bbb 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "4.0.4-Linux", "4.0.4-MacOS", "4.0.4-Windows", -"4.0.5", -"4.0.5-Linux", -"4.0.5-MacOS", -"4.0.5-Windows", "4.5a4", "4.5a4-Linux", "4.5a4-MacOS",

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 3913f3fa6b3f8310a2b59b29413b9ed51a7f6d97 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 18:15:47 2015 +0000 Update translations for torbutton-torbuttondtd --- it/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torbutton.dtd b/it/torbutton.dtd index f151a60..418fa4c 100644 --- a/it/torbutton.dtd +++ b/it/torbutton.dtd @@ -175,7 +175,7 @@ <!ENTITY torbutton.prefs.sec_svg_desc "Alcuni tipi di immagini sono disabilitati."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Le immagini SVG sono disabilitate."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript è disabilitato di default su tutti i siti non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript può essere attivato a seconda del sito usando il pulsante NoScript sulla barra strumenti."> <!ENTITY torbutton.prefs.sec_high "Alto"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript è disabilitato di default su tutti i siti."> <!ENTITY torbutton.prefs.sec_audio_video_desc "Molti formati audio e video sono disabilitati.">

1 0

[depictor/master] Create symlink for .html file, necessary for serving gzips
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 9e3fb71a4589341caea3393db4d5e5b34179daa3 Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 13:47:26 2015 -0500 Create symlink for .html file, necessary for serving gzips --- write_website.py | 1 + 1 file changed, 1 insertion(+) diff --git a/write_website.py b/write_website.py index 9c5463e..06fe35f 100755 --- a/write_website.py +++ b/write_website.py @@ -75,6 +75,7 @@ def main(): 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) subprocess.call(["gzip", "-9", archived]) + subprocess.call(["ln", "-s", archived + ".gz", archived]) def get_consensuses():

1 0

[depictor/master] Better recommended versions display
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit abb8dff5d3f196e824351b1805d322af351f806a Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 18 11:01:57 2015 -0700 Better recommended versions display This will highlight the individual versions that are different between an authority and the consensus. --- website.py | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/website.py b/website.py index d33d3fc..e75eca0 100755 --- a/website.py +++ b/website.py @@ -355,35 +355,25 @@ class WebsiteWriter: vote = self.votes[dirauth_nickname] if vote.client_versions: - if self.consensus.client_versions == vote.client_versions: - self.site.write(" <tr>\n" - + " <td>" + dirauth_nickname + "</td>\n" - + " <td>client-versions ") - self.site.write(", ".join([str(v) for v in vote.client_versions])) - self.site.write( "</td>\n" - + " </tr>\n"); - else: - self.site.write(" <tr>\n" - + " <td>" + dirauth_nickname + "</td>\n" - + " <td>client-versions ") - self.site.write(", ".join([str(v) for v in vote.client_versions])) - self.site.write("</td>\n" - + " </tr>\n") + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>client-versions ") + self.site.write(", ".join([(str(v) if v in self.consensus.client_versions else "" + str(v) + "") + for v in vote.client_versions])) + self.site.write("".join([(", <s>" + str(v) + "</s>") + for v in self.consensus.client_versions if v not in vote.client_versions])) + self.site.write("</td>\n" + + " </tr>\n") if vote.server_versions: - if self.consensus.server_versions == vote.server_versions: - self.site.write(" <tr>\n" - + " <td> </td>\n" - + " <td>server-versions ") - self.site.write(", ".join([str(v) for v in vote.server_versions])) - self.site.write("</td>\n" - + " </tr>\n"); - else: - self.site.write(" <tr>\n" - + " <td>" + dirauth_nickname + "</td>\n" - + " <td>server-versions "); - self.site.write(", ".join([str(v) for v in vote.server_versions])) - self.site.write("</td>\n" - + " </tr>\n") + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>server-versions ") + self.site.write(", ".join([(str(v) if v in self.consensus.server_versions else "" + str(v) + "") + for v in vote.server_versions])) + self.site.write("".join([(", <s>" + str(v) + "</s>") + for v in self.consensus.server_versions if v not in vote.server_versions])) + self.site.write("</td>\n" + + " </tr>\n") else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n"

1 0

[depictor/master] Remove old archival files after 3 weeks
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 1bb85aa4be437c54ee687ed67bc0f553140e180b Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 14:11:01 2015 -0500 Remove old archival files after 3 weeks --- write_website.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/write_website.py b/write_website.py index 06fe35f..f761643 100755 --- a/write_website.py +++ b/write_website.py @@ -71,12 +71,25 @@ def main(): w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) + consensus_time = w.get_consensus_time() archived = os.path.join(os.path.dirname(__file__), 'out', \ - 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') + 'consensus-health-' + consensus_time.strftime("%Y-%m-%d-%H-%M") + '.html') subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) subprocess.call(["gzip", "-9", archived]) subprocess.call(["ln", "-s", archived + ".gz", archived]) + # remove old files + weeks_to_keep = 3 + files = [f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'out'))] + for f in files: + print f + if f.startswith("consensus-health-"): + f = f.replace("consensus-health-", "").replace(".html", "") + f_time = datetime.datetime.strptime(f, "%Y-%m-%d-%H-%M") + print "\t", f_time + if (consensus_time - f_time).days > weeks_to_keep * 7: + os.remove(f) + def get_consensuses(): """

1 0

[depictor/master] Attempt to reduce memorysize before forking a bunch of times...
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 487b01f79309521ea15f3781ce0fcd0482152c10 Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 14:29:37 2015 -0500 Attempt to reduce memorysize before forking a bunch of times... --- write_website.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/write_website.py b/write_website.py index f761643..6fe9089 100755 --- a/write_website.py +++ b/write_website.py @@ -71,9 +71,14 @@ def main(): w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) + # delete giant data structures for subprocess forking by piling hacks on top of each other consensus_time = w.get_consensus_time() + import gc + del w, consensuses, votes + gc.collect() + time.sleep(1) archived = os.path.join(os.path.dirname(__file__), 'out', \ - 'consensus-health-' + consensus_time.strftime("%Y-%m-%d-%H-%M") + '.html') + 'consensus-health-' + consensus_time.strftime("%Y-%m-%d-%H-%M") + '.html') subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) subprocess.call(["gzip", "-9", archived]) subprocess.call(["ln", "-s", archived + ".gz", archived]) @@ -82,11 +87,9 @@ def main(): weeks_to_keep = 3 files = [f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'out'))] for f in files: - print f if f.startswith("consensus-health-"): - f = f.replace("consensus-health-", "").replace(".html", "") + f = f.replace("consensus-health-", "").replace(".html", "").replace(".gz", "") f_time = datetime.datetime.strptime(f, "%Y-%m-%d-%H-%M") - print "\t", f_time if (consensus_time - f_time).days > weeks_to_keep * 7: os.remove(f)

1 0

[depictor/master] Unify files on tabs, not spaces
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit d53048d3d5cc26cda821acbd366903e90e7ce25f Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 13:46:51 2015 -0500 Unify files on tabs, not spaces --- write_website.py | 161 +++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 81 deletions(-) diff --git a/write_website.py b/write_website.py index 415c7ea..9c5463e 100755 --- a/write_website.py +++ b/write_website.py @@ -27,120 +27,119 @@ from website import WebsiteWriter DIRECTORY_AUTHORITIES = stem.descriptor.remote.get_authorities() CONFIG = stem.util.conf.config_dict('consensus', { - 'ignored_authorities': [], - 'bandwidth_authorities': [], - 'known_params': [], + 'ignored_authorities': [], + 'bandwidth_authorities': [], + 'known_params': [], }) downloader = stem.descriptor.remote.DescriptorDownloader( - timeout = 60, - fall_back_to_authority = False, - document_handler = stem.descriptor.DocumentHandler.DOCUMENT, + timeout = 60, + fall_back_to_authority = False, + document_handler = stem.descriptor.DocumentHandler.DOCUMENT, ) @lru_cache() def directory_authorities(): - return dict((k, v) for (k, v) in DIRECTORY_AUTHORITIES.items() if k not in CONFIG['ignored_authorities']) + return dict((k, v) for (k, v) in DIRECTORY_AUTHORITIES.items() if k not in CONFIG['ignored_authorities']) def main(): - # loads configuration data - - config = stem.util.conf.get_config("consensus") - config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) - - consensuses, consensus_fetching_issues, consensus_fetching_runtimes = get_consensuses() - votes, vote_fetching_issues, vote_fetching_runtimes = get_votes() - - # updates the download statistics file - f = open(os.path.join(os.path.dirname(__file__), 'out', 'download-stats.csv'), 'a') - for ds in consensus_fetching_runtimes: - f.write("%s,%i,%i\n" % (ds, time.time() * 1000, int(consensus_fetching_runtimes[ds] * 1000))) - f.close() - - # great for debugging - #import pickle - #pickle.dump(consensuses, open('consensus.p', 'wb')) - #pickle.dump(votes, open('votes.p', 'wb')) - - # produces the website - w = WebsiteWriter() - w.set_consensuses(consensuses) - w.set_votes(votes) - w.set_config(CONFIG) - w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) - w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) - - archived = os.path.join(os.path.dirname(__file__), 'out', \ - 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') - subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) - subprocess.call(["gzip", "-9", archived]) + # loads configuration data + config = stem.util.conf.get_config("consensus") + config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) + + consensuses, consensus_fetching_issues, consensus_fetching_runtimes = get_consensuses() + votes, vote_fetching_issues, vote_fetching_runtimes = get_votes() + + # updates the download statistics file + f = open(os.path.join(os.path.dirname(__file__), 'out', 'download-stats.csv'), 'a') + for ds in consensus_fetching_runtimes: + f.write("%s,%i,%i\n" % (ds, time.time() * 1000, int(consensus_fetching_runtimes[ds] * 1000))) + f.close() + + # great for debugging + #import pickle + #pickle.dump(consensuses, open('consensus.p', 'wb')) + #pickle.dump(votes, open('votes.p', 'wb')) + + # produces the website + w = WebsiteWriter() + w.set_consensuses(consensuses) + w.set_votes(votes) + w.set_config(CONFIG) + w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) + w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) + + archived = os.path.join(os.path.dirname(__file__), 'out', \ + 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') + subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) + subprocess.call(["gzip", "-9", archived]) def get_consensuses(): - """ - Provides a mapping of directory authority nicknames to their present consensus. + """ + Provides a mapping of directory authority nicknames to their present consensus. - :returns: tuple of the form ({authority => consensus}, issues, runtimes) - """ + :returns: tuple of the form ({authority => consensus}, issues, runtimes) + """ - return _get_documents('consensus', '/tor/status-vote/current/consensus') + return _get_documents('consensus', '/tor/status-vote/current/consensus') def get_votes(): - """ - Provides a mapping of directory authority nicknames to their present vote. + """ + Provides a mapping of directory authority nicknames to their present vote. - :returns: tuple of the form ({authority => vote}, issues, runtimes) - """ + :returns: tuple of the form ({authority => vote}, issues, runtimes) + """ - return _get_documents('vote', '/tor/status-vote/current/authority') + return _get_documents('vote', '/tor/status-vote/current/authority') def _get_documents(label, resource): - queries, documents, issues, runtimes = {}, {}, [], {} + queries, documents, issues, runtimes = {}, {}, [], {} - for authority in directory_authorities().values(): - if authority.v3ident is None: - continue # not a voting authority + for authority in directory_authorities().values(): + if authority.v3ident is None: + continue # not a voting authority - queries[authority.nickname] = downloader.query( - resource, - endpoints = [(authority.address, authority.dir_port)], - default_params = False, - ) + queries[authority.nickname] = downloader.query( + resource, + endpoints = [(authority.address, authority.dir_port)], + default_params = False, + ) - for authority, query in queries.items(): - try: - result = query.run() - documents[authority] = result[0] - runtimes[authority] = query.runtime - except Exception, exc: - if label == 'vote': - # try to download the vote via the other authorities + for authority, query in queries.items(): + try: + result = query.run() + documents[authority] = result[0] + runtimes[authority] = query.runtime + except Exception, exc: + if label == 'vote': + # try to download the vote via the other authorities - v3ident = directory_authorities()[authority].v3ident + v3ident = directory_authorities()[authority].v3ident - query = downloader.query( - '/tor/status-vote/current/%s' % v3ident, - default_params = False, - ) + query = downloader.query( + '/tor/status-vote/current/%s' % v3ident, + default_params = False, + ) - query.run(True) + query.run(True) - if not query.error: - documents[authority] = list(query)[0] - continue + if not query.error: + documents[authority] = list(query)[0] + continue - issues.append(('AUTHORITY_UNAVAILABLE', label, authority, query.download_url, exc)) + issues.append(('AUTHORITY_UNAVAILABLE', label, authority, query.download_url, exc)) - return documents, issues, runtimes + return documents, issues, runtimes if __name__ == '__main__': - try: - main() - except: - msg = "%s failed with:\n\n%s" % (sys.argv[0], traceback.format_exc()) - print "Error: %s" % msg + try: + main() + except: + msg = "%s failed with:\n\n%s" % (sys.argv[0], traceback.format_exc()) + print "Error: %s" % msg

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2015