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

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 1bf5abaf7333d2ea607834f16ba8442e94437b69 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 05:45:30 2014 +0000 Update translations for tails-greeter_completed --- id/id.po | 124 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 95 insertions(+), 29 deletions(-) diff --git a/id/id.po b/id/id.po index ba04464..a60de45 100644 --- a/id/id.po +++ b/id/id.po @@ -3,15 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# esteween <stwn(a)kuliax.net>, 2013 -# Mohamad Hasan Al Banna, 2013 +# Iwan Setiawan <stwn(a)duniasemu.org>, 2013 +# Marg Situ <margyouversion(a)gmail.com>, 2014 +# Hasan Al Banna, 2013 +# km242saya <pencurimangga(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-08-14 23:00+0000\n" -"Last-Translator: Mohamad Hasan Al Banna\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-07-20 18:36+0200\n" +"PO-Revision-Date: 2014-08-28 05:45+0000\n" +"Last-Translator: km242saya <pencurimangga(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,26 +38,30 @@ msgid "Use persistence?" msgstr "Gunakan kegigihan?" #: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasi</a>" + +#: ../glade/persistencewindow.glade.h:6 msgid "Yes" msgstr "Ya" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "No" msgstr "Tidak" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" msgstr "Ungkapan Katasandi:" -#: ../glade/persistencewindow.glade.h:8 +#: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" msgstr "Hanya-Baca?" -#: ../glade/persistencewindow.glade.h:9 +#: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." msgstr "Ungkapan katasandi salah. Harap coba lagi." -#: ../glade/persistencewindow.glade.h:10 +#: ../glade/persistencewindow.glade.h:11 msgid "More options?" msgstr "Opsi selanjutnya?" @@ -65,41 +71,101 @@ msgstr "Kata sandi administrasi" #: ../glade/optionswindow.glade.h:4 msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentasi</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." msgstr "Masukkan katasandi administrasi dalam kasus anda membutuhkan pekerjaan administrasi.\nSelain itu akan dimatikan untuk keamanan yang lebih baik." -#: ../glade/optionswindow.glade.h:6 +#: ../glade/optionswindow.glade.h:7 msgid "Password:" msgstr "Kata sandi:" -#: ../glade/optionswindow.glade.h:7 +#: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" msgstr "Verifikasi Kata Sandi:" -#: ../glade/optionswindow.glade.h:8 +#: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" msgstr "Katasandi tidak sama" -#: ../glade/optionswindow.glade.h:9 -msgid "Windows Camouflage" -msgstr "Kamuflase Jendela" - #: ../glade/optionswindow.glade.h:10 +msgid "Windows camouflage" +msgstr "Jendela penyamaran" + +#: ../glade/optionswindow.glade.h:11 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentasi</a>" + +#: ../glade/optionswindow.glade.h:12 +msgid "" +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Pilihan ini membuat Tails lebih mirip Microsoft Windows XP. Ini mungkin akan berguna di tempat publik dalam rangka menghindari daya tarik kecurigaan." +msgstr "Pilihan ini membuat Tail lebih seperti Microsoft Windows 8. fitur ini sangat berguna untuk mencegah kecurigaan publik." -#: ../glade/optionswindow.glade.h:11 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "Aktifasi Kamuflase Microsoft Windows XP" +#: ../glade/optionswindow.glade.h:13 +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "aktifkan penyamaran Microsoft Windows 8" + +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "spoof alamat MAC" + +#: ../glade/optionswindow.glade.h:15 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentasi</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "men-spoof alamat MAC dapat menyembunyikan nomor seri kartu jaringan ke jaringan lokak. fitur ini dapat membantu anda menyembunyikan lokasi geogafis anda" + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems." +msgstr "Akan lebih aman untuk men-spoof alamat MAC, tapi hal ini dapat meningkatkan kecurigaan atau akan menjadi masalah pada sambungan jaringan" + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "Spoof semua alamat MAC" + +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Konfigurasi jaringan" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentasi</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "Hubungan internet komputer ini bebas halangan. Anda dapat langsung berhubungan dengan jaringan Tor." + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "Koneksi kekomputer ini tersensor, tersaring atau terproxy. anda perlu mengatur pengaturan bridge, firewall, atau pengaturan proxy" #: ../glade/langpanel.glade.h:1 msgid " " msgstr " " -#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 msgid "Language" msgstr "Bahasa" @@ -111,14 +177,14 @@ msgstr "Lokal" msgid "Layout" msgstr "Tata Letak" -#: ../GdmGreeter/persistence.py:59 +#: ../tailsgreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stderr)s" -#: ../GdmGreeter/persistence.py:99 +#: ../tailsgreeter/persistence.py:99 #, python-format msgid "" "cryptsetup failed with return code %(returncode)s:\n" @@ -126,7 +192,7 @@ msgid "" "%(stderr)s" msgstr "Konfigrasi Crypt gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../GdmGreeter/persistence.py:124 +#: ../tailsgreeter/persistence.py:124 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" @@ -134,7 +200,7 @@ msgid "" "%(stderr)s" msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 -#: ../GdmGreeter/langpanel.py:181 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Lainnya..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 195e4a403f20038494f9911c940783599f4af4bd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 05:45:27 2014 +0000 Update translations for tails-greeter --- id/id.po | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/id/id.po b/id/id.po index 6769fa3..a60de45 100644 --- a/id/id.po +++ b/id/id.po @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# esteween <stwn(a)duniasemu.org>, 2013 -# margyouversion <margyouversion(a)gmail.com>, 2014 -# Mohamad Hasan Al Banna, 2013 +# Iwan Setiawan <stwn(a)duniasemu.org>, 2013 +# Marg Situ <margyouversion(a)gmail.com>, 2014 +# Hasan Al Banna, 2013 +# km242saya <pencurimangga(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-20 18:36+0200\n" +"PO-Revision-Date: 2014-08-28 05:45+0000\n" +"Last-Translator: km242saya <pencurimangga(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "Gunakan kegigihan?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasi</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -72,7 +73,7 @@ msgstr "Kata sandi administrasi" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentasi</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -94,49 +95,49 @@ msgstr "Katasandi tidak sama" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Jendela penyamaran" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Dokumentasi</a>" #: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "Pilihan ini membuat Tail lebih seperti Microsoft Windows 8. fitur ini sangat berguna untuk mencegah kecurigaan publik." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "" +msgstr "aktifkan penyamaran Microsoft Windows 8" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" -msgstr "" +msgstr "spoof alamat MAC" #: ../glade/optionswindow.glade.h:15 msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentasi</a>" #: ../glade/optionswindow.glade.h:16 msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "" +msgstr "men-spoof alamat MAC dapat menyembunyikan nomor seri kartu jaringan ke jaringan lokak. fitur ini dapat membantu anda menyembunyikan lokasi geogafis anda" #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "Akan lebih aman untuk men-spoof alamat MAC, tapi hal ini dapat meningkatkan kecurigaan atau akan menjadi masalah pada sambungan jaringan" #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" -msgstr "" +msgstr "Spoof semua alamat MAC" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" @@ -146,7 +147,7 @@ msgstr "Konfigurasi jaringan" msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentasi</a>" #: ../glade/optionswindow.glade.h:21 msgid "" @@ -158,7 +159,7 @@ msgstr "Hubungan internet komputer ini bebas halangan. Anda dapat langsung berh msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "Koneksi kekomputer ini tersensor, tersaring atau terproxy. anda perlu mengatur pengaturan bridge, firewall, atau pengaturan proxy" #: ../glade/langpanel.glade.h:1 msgid " " @@ -199,7 +200,7 @@ msgid "" "%(stderr)s" msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Lainnya..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 7baa498c985cd132044aa53c9d813793c9f40c62 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 05:45:21 2014 +0000 Update translations for tails-persistence-setup --- id/id.po | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/id/id.po b/id/id.po index aa9385a..6e10380 100644 --- a/id/id.po +++ b/id/id.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# km242saya <pencurimangga(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-08-28 05:30+0000\n" +"Last-Translator: km242saya <pencurimangga(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "Data Pribadi" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" @@ -118,67 +119,67 @@ msgstr "" msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Kesalahan" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "Kesalahan" - -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 99075ac1bb496b1002ffc2698ca1a88b4289a67f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 04:45:37 2014 +0000 Update translations for tor-launcher-network-settings --- ru/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 375be22..90857ae 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -57,6 +57,6 @@ <!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> <!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.  Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком.">

1 0

[bridgedb/develop] Add note that bridgedb.Bridges.ID_LEN isn't used.
by isis＠torproject.org 28 Aug '14

28 Aug '14

commit 77ec3514a68af4398f1471ed36cbd9baa42b1bb2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 10 22:08:22 2014 +0000 Add note that bridgedb.Bridges.ID_LEN isn't used. It's only occurence is in one commented out line of code, in bridgedb.Storage: L414: # bridgedb.Bridges.chopString(v, bridgedb.Bridges.ID_LEN))) --- lib/bridgedb/Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a338b40..50519fb 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -36,7 +36,7 @@ except ImportError: from io import StringIO -ID_LEN = 20 +ID_LEN = 20 # XXX Only used in commented out line in Storage.py DIGEST_LEN = 20 PORTSPEC_LEN = 16

1 0

[bridgedb/develop] Make `isValidIP()` backwards compatible with deprecated `is_valid_ip()`.
by isis＠torproject.org 28 Aug '14

28 Aug '14

commit ee0ba04f6345b22c9adea0a7eb7761cfb5558fb1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 00:10:21 2014 +0000 Make `isValidIP()` backwards compatible with deprecated `is_valid_ip()`. The old `bridgedb.Bridges.is_valid_ip()` function expected a single string parameter, and would return a boolean. The new `bridgedb.parse.addr.isValidIP()` function expected an `ipaddr.IPAddress` as a parameter. * CHANGE `bridgedb.parse.addr.isValidIP()` to convert any strings which it receives as arguments into `ipaddr.IPAddress`s, which makes it backwards compatible with the (deprecated) `bridgedb.Bridges.is_valid_ip()` function. --- lib/bridgedb/parse/addr.py | 47 +++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index 01acf58..750ed78 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -396,34 +396,41 @@ def isValidIP(ip): >>> isValidIP('xyzzy') False - :type ip: An :class:`ipaddr.IPAddress`, :class:`ipaddr.IPv4Address`, or - :class:`ipaddr.IPv6Address`. - :param ip: An ``ipaddr.IPAddress`` class. + :type ip: An :class:`ipaddr.IPAddress`, :class:`ipaddr.IPv4Address`, + :class:`ipaddr.IPv6Address`, or str + :param ip: An IP address. If it is a string, it will be converted to a + :class:`ipaddr.IPAddress`. :rtype: boolean :returns: ``True``, if **ip** passes the checks; False otherwise. """ reasons = [] - if ip.is_link_local: - reasons.append('link local') - if ip.is_loopback: - reasons.append('loopback') - if ip.is_multicast: - reasons.append('multicast') - if ip.is_private: - reasons.append('private') - if ip.is_unspecified: - reasons.append('unspecified') - - if (ip.version == 6) and ip.is_site_local: - reasons.append('site local') - elif (ip.version == 4) and ip.is_reserved: - reasons.append('reserved') + try: + if isinstance(ip, basestring): + ip = ipaddr.IPAddress(ip) + + if ip.is_link_local: + reasons.append('link local') + if ip.is_loopback: + reasons.append('loopback') + if ip.is_multicast: + reasons.append('multicast') + if ip.is_private: + reasons.append('private') + if ip.is_unspecified: + reasons.append('unspecified') + + if (ip.version == 6) and ip.is_site_local: + reasons.append('site local') + elif (ip.version == 4) and ip.is_reserved: + reasons.append('reserved') + except ValueError: + reasons.append('cannot convert to ip') if reasons: explain = ', '.join([r for r in reasons]).strip(', ') - logging.debug("IPv%d address %s is invalid! Reason(s): %s" - % (ip.version, ip, explain)) + logging.debug("IP address %r is invalid! Reason(s): %s" + % (ip, explain)) return False return True

1 0

[bridgedb/develop] Move old b.Bridges.is_valid_ip() doctest to b.p.addr.isValidIP().
by isis＠torproject.org 28 Aug '14

28 Aug '14

commit fc07c5b64de89a63b0518864b3b8d250e1503533 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 00:09:08 2014 +0000 Move old b.Bridges.is_valid_ip() doctest to b.p.addr.isValidIP(). --- lib/bridgedb/parse/addr.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index ace4c80..01acf58 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -320,21 +320,6 @@ def isIPAddress(ip, compressed=True): def _isIPv(version, ip): """Check if **ip** is a certain **version** (IPv4 or IPv6). - >>> from bridgedb.parse.addr import isValidIP - >>> isValidIP('1.2.3.4') - True - >>> isValidIP('1.2.3.255') - True - >>> isValidIP('1.2.3.256') - False - >>> isValidIP('1') - False - >>> isValidIP('1.2.3') - False - >>> isValidIP('xyzzy') - False - - .. warning: Do *not* put any calls to the logging module in this function, or else an infinite recursion will occur when the call is made, due the the log :class:`~logging.Filter`s in :mod:`~bridgedb.safelog` @@ -397,6 +382,20 @@ def isValidIP(ip): * A :term:`Site-Local Address` or an :term:`Unique Local Address`. + >>> from bridgedb.parse.addr import isValidIP + >>> isValidIP('1.2.3.4') + True + >>> isValidIP('1.2.3.255') + True + >>> isValidIP('1.2.3.256') + False + >>> isValidIP('1') + False + >>> isValidIP('1.2.3') + False + >>> isValidIP('xyzzy') + False + :type ip: An :class:`ipaddr.IPAddress`, :class:`ipaddr.IPv4Address`, or :class:`ipaddr.IPv6Address`. :param ip: An ``ipaddr.IPAddress`` class.

1 0

[bridgedb/develop] Rip out `BridgeHolder.assignmentsArePersistent()`, it's never used.
by isis＠torproject.org 28 Aug '14

28 Aug '14

commit 6206e1f36d94ce1ed3f838a4a16716617772eac7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 16:30:51 2014 +0000 Rip out `BridgeHolder.assignmentsArePersistent()`, it's never used. Also, for what it's worth: the "proper" way to implement this would have been as an @property. * REMOVE the `assignmentsArePersistent` method from several hashring classes in bridgedb.Bridges module. --- lib/bridgedb/Bridges.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 50519fb..d159b64 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -734,12 +734,10 @@ class BridgeHolder(object): def clear(self): pass - def assignmentsArePersistent(self): - return True - def dumpAssignments(self, f, description=""): pass + class BridgeRingParameters(object): """Store validated settings on minimum number of Bridges with certain attributes which should be included in any generated subring of a @@ -1097,9 +1095,6 @@ class UnallocatedHolder(BridgeHolder): if not bridge.fingerprint in self.fingerprints: self.fingerprints.append(bridge.fingerprint) - def assignmentsArePersistent(self): - return False - def __len__(self): return len(self.fingerprints) @@ -1403,10 +1398,6 @@ class FilteredBridgeSplitter(BridgeHolder): " ".join([v for k,v in grouped.items()]).strip()) f.write("%s %s\n"%( toHex(b.getID()), desc)) - def assignmentsArePersistent(self): - return False - - class BridgeBlock(object): """Base class that abstracts bridge blocking. @@ -1421,9 +1412,6 @@ class BridgeBlock(object): def clear(self): pass - def assignmentsArePersistent(self): - return True - class CountryBlock(BridgeBlock): """Countrywide bridge blocking""" def __init__(self):

1 0

[bridgedb/develop] Support requiring distribution of bridges with the "Running" flag.
by isis＠torproject.org 28 Aug '14

28 Aug '14

commit 55f669dac35c3f86f2a24d67e0e9d899b75c73c8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 20:15:21 2014 +0000 Support requiring distribution of bridges with the "Running" flag. * CHANGE bridgedb.Bridges.BridgeRingParameters class to support using the FORCE_FLAGS config setting to require some N of bridges distributed to have the "Running" flag. --- bridgedb.conf | 8 ++++++-- lib/bridgedb/Bridges.py | 6 +----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index a1d6c59..c8c0de1 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -20,9 +20,12 @@ # # CHANGELOG: # ~~~~~~~~~~ -# Changes in version 0.0.10 - 2014-07-06 +# Changes in version 0.0.11 - 2014-07-06 # * ADD EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings. # +# Changes in version 0.0.10 - 2014-06-06 +# * Support requiring distribution of bridges with the "Running" flag. +# # Changes in version 0.0.9 - 2014-06-06 # * ADD EMAIL_WHITELIST setting. # @@ -196,7 +199,8 @@ N_IP_CLUSTERS = 4 FORCE_PORTS = [(443, 1)] # If possible, always give a certain number of answers with a given flag. -# Only "Stable" is now supported. This is a list of (flag,minimum) tuples. +# Both "Running" and "Stable" are supported. +# This is a list of (flag,minimum) tuples. FORCE_FLAGS = [("Stable", 1)] # Only consider routers whose purpose matches this string. diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index d159b64..fa9c246 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -755,10 +755,6 @@ class BridgeRingParameters(object): """Control the creation of subrings by including a minimum number of bridges which possess certain attributes. - XXX In bridgedb.conf, there is a note on the FORCE_FLAGS setting which - reads: "Only 'stable' is now supported." Is this still the case? - Why? - :type needPorts: iterable :param needPorts: An iterable of two-tuples. Each two tuple should contain ``(port, minimum)``, where ``port`` is an integer @@ -782,7 +778,7 @@ class BridgeRingParameters(object): raise TypeError("Count %s out of range." % count) for flag, count in needFlags: flag = flag.lower() - if flag not in ["stable",]: + if flag not in ["stable", "running",]: raise TypeError("Unsupported flag %s" % flag) if count <= 0: raise TypeError("Count %s out of range." % count)

1 0

[bridgedb/develop] Change import of IBridgeRequest to IRequestBridges in test_bridgerequest.py.
by isis＠torproject.org 28 Aug '14

28 Aug '14

commit 0168a79dbbe311449cc7cba0dc859c0b3e45901d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 10:27:53 2014 +0000 Change import of IBridgeRequest to IRequestBridges in test_bridgerequest.py. --- lib/bridgedb/test/test_bridgerequest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridgerequest.py b/lib/bridgedb/test/test_bridgerequest.py index 1db8814..24dcad2 100644 --- a/lib/bridgedb/test/test_bridgerequest.py +++ b/lib/bridgedb/test/test_bridgerequest.py @@ -14,7 +14,7 @@ from twisted.trial import unittest from bridgedb import bridgerequest -from bridgedb.bridgerequest import IBridgeRequest +from bridgedb.bridgerequest import IRequestBridges from bridgedb.bridgerequest import BridgeRequestBase @@ -27,7 +27,7 @@ class BridgeRequestBaseTests(unittest.TestCase): def test_BridgeRequestBase_implements_IRequestBridges(self): """BridgeRequestBase should implement IRequestBridges interface.""" - self.assertTrue(IBridgeRequest.implementedBy(BridgeRequestBase)) + self.assertTrue(IRequestBridges.implementedBy(BridgeRequestBase)) def test_BridgeRequestBase_withoutBlockInCountry(self): """BridgeRequestBase.withoutBlockInCountry() should add the country CC

1 0