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

[ooni-probe/master] Update archive reports script to reflect report format changes
by art＠torproject.org 07 Jan '13

07 Jan '13

commit 73eb92a709e34cd191985b861d6b2442fcc47669 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jan 7 21:26:51 2013 +0100 Update archive reports script to reflect report format changes --- scripts/archive_reports.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/archive_reports.py b/scripts/archive_reports.py index 8246822..c49bd7a 100755 --- a/scripts/archive_reports.py +++ b/scripts/archive_reports.py @@ -83,6 +83,10 @@ def get_report_header_fields(report_header): except KeyError: return None +def get_test_name(fields): + test_name = fields['test_name'].lower().replace(' ', '_') + return test_name + def get_target_or_fail(fields, report): # set the target filename reportFormatVersion = fields['test_version'] @@ -90,6 +94,7 @@ def get_target_or_fail(fields, report): # XXX: wouldn't hurt to check timestamp for sanity again? dateInISO8601Format,__,__ = os.path.basename(report).split('_') probeASNumber = fields['probe_asn'] + testName = get_test_name(fields) # make sure path reportFormatVersion/CC exists path = os.path.abspath(report_archive_dir) @@ -103,15 +108,15 @@ def get_target_or_fail(fields, report): return None # if the target file already exists, try to find another filename - filename = "%s_%s.yamloo" % (dateInISO8601Format, probeASNumber) + filename = "%s-%s-%s.yamloo" % (testName, dateInISO8601Format, probeASNumber) target = os.path.join(path, filename) # try to get a unique filename. os.open as used below requires # that the file not already exist naming_attempts = 1 while os.path.exists(target) and naming_attempts < retry_attempts: - filename = "%s_%s.%d.yamloo" % (dateInISO8601Format, probeASNumber, - naming_attempts) + filename = "%s-%s-%s.%d.yamloo" % (testName, dateInISO8601Format, + probeASNumber, naming_attempts) target = os.path.join(path, filename) naming_attempts = naming_attempts + 1

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 07 Jan '13

07 Jan '13

commit 5552cf77620597c5494744d42760ad248f6219b7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 7 20:16:11 2013 +0000 Update translations for torbirdy_completed --- fr/torbirdy.dtd | 6 ++++++ fr/torbirdy.properties | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index 07d13c0..5ed5712 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -33,8 +33,14 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Selectionner comme dossier d'acceuil le dernier dossier email visité [default: désactivé, votre dossier local sera séléctionné]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Ne pas configurer le fuseau horaire de Thunderbird en UTC [par défaut: configurer en UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Désactiver le GPG '--throw-keyids' [default: activé]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Compte-spécifique"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Choisir un compte: "> + +<!ENTITY torbirdy.panel.usetor.label "Utiliser un routeur Oignon Tor"> +<!ENTITY torbirdy.panel.usejondo.label "Utiliser JonDo (Premium)"> +<!ENTITY torbirdy.panel.preferences.label "Ouvrir les préférences de TorBirdy"> diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties index 27ae7ca..c9ea5a0 100644 --- a/fr/torbirdy.properties +++ b/fr/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy a désactivé la configration automatique de Thun torbirdy.email.advanced=Veuiller noter qu'il n'est PAS recommandé de modifier les paramètres avancés de TorBirdy.\n\nVous pouvez continuer si vous êtes sur de ce que vous faites. torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine fois torbirdy.email.advanced.title=Paramètres Avancés de TorBirdy + +torbirdy.restart=Pour appliquer le fuseau horaire, merci de fermer et redémarrer Thunderbird à nouveau.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 07 Jan '13

07 Jan '13

commit dfb426c2124cdb6ce3b745934c35a4f7484a5d96 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 7 20:16:08 2013 +0000 Update translations for torbirdy --- fr/torbirdy.dtd | 10 +++++----- fr/torbirdy.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index 2f3529d..5ed5712 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -33,14 +33,14 @@ <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "Selectionner comme dossier d'acceuil le dernier dossier email visité [default: désactivé, votre dossier local sera séléctionné]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label ""> -<!ENTITY torbirdy.prefs.timezone.key ""> +<!ENTITY torbirdy.prefs.timezone.label "Ne pas configurer le fuseau horaire de Thunderbird en UTC [par défaut: configurer en UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Désactiver le GPG '--throw-keyids' [default: activé]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Compte-spécifique"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Choisir un compte: "> -<!ENTITY torbirdy.panel.usetor.label ""> -<!ENTITY torbirdy.panel.usejondo.label ""> -<!ENTITY torbirdy.panel.preferences.label ""> +<!ENTITY torbirdy.panel.usetor.label "Utiliser un routeur Oignon Tor"> +<!ENTITY torbirdy.panel.usejondo.label "Utiliser JonDo (Premium)"> +<!ENTITY torbirdy.panel.preferences.label "Ouvrir les préférences de TorBirdy"> diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties index 00de8f4..c9ea5a0 100644 --- a/fr/torbirdy.properties +++ b/fr/torbirdy.properties @@ -12,4 +12,4 @@ torbirdy.email.advanced=Veuiller noter qu'il n'est PAS recommandé de modifier l torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine fois torbirdy.email.advanced.title=Paramètres Avancés de TorBirdy -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=Pour appliquer le fuseau horaire, merci de fermer et redémarrer Thunderbird à nouveau.

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 07 Jan '13

07 Jan '13

commit 2a4de19171285a45185dc0d242e953a33864141f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 7 20:16:03 2013 +0000 Update translations for tails-persistence-setup_completed --- fr/fr.po | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index b0d58d7..4917f7d 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# arpalord <arpalord(a)gmail.com>, 2013. # <paul(a)dabuttonfactory.com>, 2012. # <vanmortel(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-10-03 16:16+0200\n" -"PO-Revision-Date: 2012-10-19 22:29+0000\n" -"Last-Translator: palsecam <paul(a)dabuttonfactory.com>\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2013-01-07 20:05+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,26 +77,34 @@ msgid "Configuration of network devices and connections" msgstr "Configuration de cartes réseaux et connexions" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Marque-pages du navigateur" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Marque-page sauvegardé dans le navigateur Iceweasel" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" msgstr "Paquets APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Packages downloaded by APT" msgstr "Paquets téléchargés par APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Lists" msgstr "Listes d'APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Lists downloaded by APT" msgstr "Listes de paquets téléchargées par APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "Dotfiles" msgstr "Dotfiles" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Créer un lien symbolique, dans $HOME, vers chaque fichier se trouvant dans le dossier `dotfiles'" @@ -194,8 +203,8 @@ msgstr "Choississez une phrase de passe pour protéger le volume persistant" #, perl-format msgid "" "A %s persistent volume will be created on the %s %s device. Data on " -"this device will be stored in an encrypted form protected by a passphrase." -msgstr "Un volume persistant %s sera créé sur le périphérique %s %s. Les données stockées sur ce périphérique seront chiffrées, et protégées par une phrase de passe." +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "Un volume persistant %s sera créé sur le périphérique %s %s. Les données stockées sur ce périphérique seront chiffrées et protégées par une phrase de passe." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 07 Jan '13

07 Jan '13

commit a74dbae37d86cf1535b3dd31a11c502ac97e52e2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 7 20:15:59 2013 +0000 Update translations for tails-persistence-setup --- fr/fr.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 85ce85f..4917f7d 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# arpalord <arpalord(a)gmail.com>, 2013. # <paul(a)dabuttonfactory.com>, 2012. # <vanmortel(a)gmail.com>, 2012. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2012-11-28 09:09+0000\n" -"Last-Translator: palsecam <paul(a)dabuttonfactory.com>\n" +"PO-Revision-Date: 2013-01-07 20:05+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,11 +78,11 @@ msgstr "Configuration de cartes réseaux et connexions" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "Marque-pages du navigateur" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Marque-page sauvegardé dans le navigateur Iceweasel" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -203,7 +204,7 @@ msgstr "Choississez une phrase de passe pour protéger le volume persistant" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "Un volume persistant %s sera créé sur le périphérique %s %s. Les données stockées sur ce périphérique seront chiffrées et protégées par une phrase de passe." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0

[flashproxy/master] Update and tweak bundle-macosx.txt.
by dcf＠torproject.org 07 Jan '13

07 Jan '13

commit 6a9f9b0619770bf716e2ea7309ac093b8f0e9757 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 6 23:39:23 2013 -0800 Update and tweak bundle-macosx.txt. --- doc/bundle-macosx.txt | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 7bea830..851b456 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -43,8 +43,8 @@ http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc === PyCrypto -http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz -http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc +https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz +https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc Extract and verify the tarball. Then run @@ -53,36 +53,47 @@ Extract and verify the tarball. Then run === pyptlib $ git clone https://git.torproject.org/user/asn/pyptlib.git - $ cd pyptlib && python setup.py install --root=~/bundle --prefix=/usr + $ cd pyptlib + $ python setup.py install --root=~/bundle --prefix=/usr == Browser bundle -Run "make dist" in the flashproxy source directory. +Clone and build the flashproxy source. + + $ git clone https://git.torproject.org/flashproxy.git + $ cd flashproxy + $ make dist + +Clone pyobfsproxy. + + $ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2 Download the 32-bit obfsproxy bundle from https://www.torproject.org/projects/obfsproxy. -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip.asc +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip +https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip.asc Extract the bundle. - $ gpg --verify TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip.asc - $ unzip TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip - $ cd TorBrowser_en-US.app + $ gpg --verify TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip.asc + $ rm -r TorBrowser_en-US.app + $ unzip TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip Copy files into the bundle. + $ cd TorBrowser_en-US.app + $ rm -f Contents/MacOS/obfsproxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS $ cp -r ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS $ mkdir -p Contents/Resources/Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Contents/Resources/Docs/FlashProxy - - $ rm Contents/MacOs/obfsproxy $ cp -r ~/pyobfsproxy/{obfsproxy,obfsproxy.py} Contents/MacOs $ cp -r ~/bundle/usr/lib/python2.7/site-packages/{Crypto,pyptlib} Contents/MacOS $ mkdir -p Contents/Resources/Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy + $ find App -name '*.pyc' | xargs rm -f + $ find Contents/MacOS -name '*.pyc' | xargs rm -f Make the second half of Library/Vidalia/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). @@ -104,17 +115,17 @@ CircuitBuildTimeout 60 # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2 exec obfsproxy.py managed +ClientTransportPlugin obfs2,obfs3 exec obfsproxy.py managed Re-zip the bundle. The "alpha" number should be independent of the obfsproxy bundle's alpha. $ cd .. - $ rm -f TorBrowser-FlashProxy-2.4.6-alpha-1-osx-i386-en-US.zip - $ zip -r -9 TorBrowser-FlashProxy-2.4.6-alpha-1-osx-i386-en-US.zip TorBrowser_en-US.app/ + $ rm -f TorBrowser-FlashProxy-PyObfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip + $ zip -r -9 TorBrowser-FlashProxy-PyObfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip TorBrowser_en-US.app/ Test running the bundle. Extract into a separate directory, double-click the icon to unzip, and run TorBrowser_en-US.app. $ mkdir tmp - $ cp TorBrowser-FlashProxy-2.4.6-alpha-1-osx-i386-en-US.zip tmp + $ cp TorBrowser-FlashProxy-PyObfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip tmp

1 0

[flashproxy/master] Add some missing cp options.
by dcf＠torproject.org 07 Jan '13

07 Jan '13

commit f3dd44cc08558415b41d1e2c9864586dc126cf24 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 6 23:39:37 2013 -0800 Add some missing cp options. --- doc/bundle-gnulinux.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 0c00e28..dab8f22 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -112,7 +112,7 @@ Copy files into the bundle. $ mkdir -p Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy $ cp -rL ~/pyobfsproxy/{obfsproxy,obfsproxy.py} App - $ cp /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} App + $ cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} App $ cp -rL /usr/lib/pymodules/python2.6/argparse.py App $ cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib App $ mkdir -p Docs/PyObfsproxy

1 0

[stem/master] Conforming to E303 (too many blank lines)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 026dbce5bf191c38a48605f041b10f10629d22b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 19:44:13 2013 -0800 Conforming to E303 (too many blank lines) Had an extra newline at one point. I'm starting to like this style checker thing... --- stem/descriptor/extrainfo_descriptor.py | 1 - test/check_whitespace.py | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 8ad10e1..284681b 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -524,7 +524,6 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): key_type = "STATUS" if is_response_stats else "STAT" error_msg = "%s lines should contain %s=COUNT mappings: %s" % (keyword, key_type, line) - if value: for entry in value.split(","): if not "=" in entry: diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 7b7a181..dacd594 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -47,7 +47,7 @@ def pep8_issues(base_path = DEFAULT_TARGET): # We're gonna trim these down by cateogry but include the pep8 checks to # prevent regression. - ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221,E126,E262,E271,E502,E303" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221,E126,E262,E271,E502" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path))

1 0

[stem/master] Conforming to E221 (multiple spaces before operator)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit f735fbc11973fd03435df0bc306d800433bbbeae Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 20:06:55 2013 -0800 Conforming to E221 (multiple spaces before operator) I'd forgotten that PEP8 forbade aligned assignments. This is another spot that I think PEP8 is in the wrong in terms of readability but I don't care overly much. --- stem/descriptor/__init__.py | 8 ++++---- stem/descriptor/server_descriptor.py | 12 ++++++------ stem/util/system.py | 24 ++++++++++++------------ test/check_whitespace.py | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index c66f298..98388a3 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -34,11 +34,11 @@ try: except ImportError: from stem.util.ordereddict import OrderedDict -KEYWORD_CHAR = "a-zA-Z0-9-" -WHITESPACE = " \t" -KEYWORD_LINE = re.compile("^([%s]+)(?:[%s]+(.*))?$" % (KEYWORD_CHAR, WHITESPACE)) +KEYWORD_CHAR = "a-zA-Z0-9-" +WHITESPACE = " \t" +KEYWORD_LINE = re.compile("^([%s]+)(?:[%s]+(.*))?$" % (KEYWORD_CHAR, WHITESPACE)) PGP_BLOCK_START = re.compile("^-----BEGIN ([%s%s]+)-----$" % (KEYWORD_CHAR, WHITESPACE)) -PGP_BLOCK_END = "-----END %s-----" +PGP_BLOCK_END = "-----END %s-----" Flag = stem.util.enum.Enum( ("AUTHORITY", "Authority"), diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 8f73cdd..e51de8b 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -350,11 +350,11 @@ class ServerDescriptor(stem.descriptor.Descriptor): elif not (router_comp[2].isdigit() and router_comp[3].isdigit() and router_comp[4].isdigit()): continue - self.nickname = router_comp[0] - self.address = router_comp[1] - self.or_port = int(router_comp[2]) + self.nickname = router_comp[0] + self.address = router_comp[1] + self.or_port = int(router_comp[2]) self.socks_port = None if router_comp[3] == '0' else int(router_comp[3]) - self.dir_port = None if router_comp[4] == '0' else int(router_comp[4]) + self.dir_port = None if router_comp[4] == '0' else int(router_comp[4]) elif keyword == "bandwidth": # "bandwidth" bandwidth-avg bandwidth-burst bandwidth-observed bandwidth_comp = value.split() @@ -373,8 +373,8 @@ class ServerDescriptor(stem.descriptor.Descriptor): if not validate: continue raise ValueError("Bandwidth line's observed rate isn't numeric: %s" % bandwidth_comp[2]) - self.average_bandwidth = int(bandwidth_comp[0]) - self.burst_bandwidth = int(bandwidth_comp[1]) + self.average_bandwidth = int(bandwidth_comp[0]) + self.burst_bandwidth = int(bandwidth_comp[1]) self.observed_bandwidth = int(bandwidth_comp[2]) elif keyword == "platform": # "platform" string diff --git a/stem/util/system.py b/stem/util/system.py index 080b080..bfdeb14 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -44,20 +44,20 @@ CMD_AVAILABLE_CACHE = {} SHELL_COMMANDS = ['ulimit'] -IS_RUNNING_PS_LINUX = "ps -A co command" -IS_RUNNING_PS_BSD = "ps -ao ucomm=" -GET_PID_BY_NAME_PGREP = "pgrep -x %s" -GET_PID_BY_NAME_PIDOF = "pidof %s" +IS_RUNNING_PS_LINUX = "ps -A co command" +IS_RUNNING_PS_BSD = "ps -ao ucomm=" +GET_PID_BY_NAME_PGREP = "pgrep -x %s" +GET_PID_BY_NAME_PIDOF = "pidof %s" GET_PID_BY_NAME_PS_LINUX = "ps -o pid -C %s" -GET_PID_BY_NAME_PS_BSD = "ps axc" -GET_PID_BY_NAME_LSOF = "lsof -tc %s" -GET_PID_BY_PORT_NETSTAT = "netstat -npltu" +GET_PID_BY_NAME_PS_BSD = "ps axc" +GET_PID_BY_NAME_LSOF = "lsof -tc %s" +GET_PID_BY_PORT_NETSTAT = "netstat -npltu" GET_PID_BY_PORT_SOCKSTAT = "sockstat -4l -P tcp -p %s" -GET_PID_BY_PORT_LSOF = "lsof -wnP -iTCP -sTCP:LISTEN" -GET_PID_BY_FILE_LSOF = "lsof -tw %s" -GET_CWD_PWDX = "pwdx %s" -GET_CWD_LSOF = "lsof -a -p %s -d cwd -Fn" -GET_BSD_JAIL_ID_PS = "ps -p %s -o jid" +GET_PID_BY_PORT_LSOF = "lsof -wnP -iTCP -sTCP:LISTEN" +GET_PID_BY_FILE_LSOF = "lsof -tw %s" +GET_CWD_PWDX = "pwdx %s" +GET_CWD_LSOF = "lsof -a -p %s -d cwd -Fn" +GET_BSD_JAIL_ID_PS = "ps -p %s -o jid" def is_windows(): """ diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 06e5560..d6ad946 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -47,7 +47,7 @@ def pep8_issues(base_path = DEFAULT_TARGET): # We're gonna trim these down by cateogry but include the pep8 checks to # prevent regression. - ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path))

1 0

[stem/master] Conforming to E271 (multiple spaces after keyword)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 6bc6c231e16122e66205e8e04b849f316fa6ada7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 19:51:13 2013 -0800 Conforming to E271 (multiple spaces after keyword) Caught an extra space in the ordereddict we brought in. Nice catch. --- stem/util/ordereddict.py | 2 +- test/check_whitespace.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/util/ordereddict.py b/stem/util/ordereddict.py index cb97874..4466097 100644 --- a/stem/util/ordereddict.py +++ b/stem/util/ordereddict.py @@ -119,7 +119,7 @@ class OrderedDict(dict, DictMixin): if isinstance(other, OrderedDict): if len(self) != len(other): return False - for p, q in zip(self.items(), other.items()): + for p, q in zip(self.items(), other.items()): if p != q: return False return True diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 50fec10..46020f8 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -47,7 +47,7 @@ def pep8_issues(base_path = DEFAULT_TARGET): # We're gonna trim these down by cateogry but include the pep8 checks to # prevent regression. - ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221,E126,E262,E271" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221,E126,E262" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path))

1 0