- tor-commits - lists.torproject.org

[orbot/master] small changes to layout title centering
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit bfeceb7fd07bda0d7aa5aba4e7e2a58a8028cf70 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 03:38:09 2011 -0500 small changes to layout title centering --- res/layout/scrollingtext_buttons_view.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/res/layout/scrollingtext_buttons_view.xml b/res/layout/scrollingtext_buttons_view.xml index 0f4ea72..cde7405 100644 --- a/res/layout/scrollingtext_buttons_view.xml +++ b/res/layout/scrollingtext_buttons_view.xml @@ -11,22 +11,22 @@ android:layout_width="fill_parent" android:layout_height="70sp" android:layout_gravity="center_vertical|center_horizontal" - android:background="#000000" - android:gravity="center" > + android:background="#000000" > <ImageView android:id="@+id/orbot_image" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_marginTop="9dip" + android:layout_height="fill_parent" android:paddingLeft="20sp" - android:src="@drawable/warning" > + android:src="@drawable/warning" + android:gravity="center_vertical" + + > </ImageView> <TextView android:textColor="#FFFFFF" - android:textSize="10pt" + android:textSize="20dp" android:layout_toRightOf="@id/orbot_image" android:gravity="center_vertical" android:layout_height="fill_parent"

1 0

[orbot/master] a bit more cleanup on strings for about and hidden service requests
by n8fr8＠torproject.org 14 Nov '11

14 Nov '11

commit 2b8eef305cfe5dc33c3f1d4b59252688c481fab4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Nov 14 04:03:41 2011 -0500 a bit more cleanup on strings for about and hidden service requests --- res/layout/layout_about.xml | 18 ++-- res/values/strings.xml | 11 +++- src/org/torproject/android/Orbot.java | 143 ++++++++++++++------------------- 3 files changed, 78 insertions(+), 94 deletions(-) diff --git a/res/layout/layout_about.xml b/res/layout/layout_about.xml index 0e0be56..fbc8cae 100644 --- a/res/layout/layout_about.xml +++ b/res/layout/layout_about.xml @@ -40,14 +40,14 @@ android:paddingLeft="15px" android:layout_gravity="center_vertical" android:textColor="#ffffff" /> - <TextView android:text="Project Home(s): " + <TextView android:text="@string/project_home" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="15px" android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…" + <TextView android:text="@string/project_urls" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" @@ -61,47 +61,47 @@ android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="The Tor License" + <TextView android:text="@string/the_tor_license" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="https://torproject.org" + <TextView android:text="@string/https_torproject_org" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="3rd-Party-Software: " + <TextView android:text="@string/third_party_software" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="15px" android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="Tor v0.2.3.6-alpha: https://www.torproject.org" + <TextView android:text="@string/tor_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/" + <TextView android:text="@string/libevent_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="Privoxy v3.0.12: http://www.privoxy.org" + <TextView android:text="@string/privoxy_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="Iptables v1.4.7: http://www.netfilter.org" + <TextView android:text="@string/iptables_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" diff --git a/res/values/strings.xml b/res/values/strings.xml index 546be68..0cbd848 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -232,5 +232,14 @@ <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - +<string name="project_home">Project Home(s): </string> +<string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> +<string name="the_tor_license">The Tor License</string> +<string name="https_torproject_org">https://torproject.org</string> +<string name="third_party_software">3rd-Party-Software: </string> +<string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string> +<string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> +<string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> +<string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> +<string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> </resources> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 8493f00..b7bb62f 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -3,9 +3,6 @@ package org.torproject.android; - - - import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorServiceConstants; @@ -253,30 +250,6 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } - /* Return to the main view when the back key is pressed - * (non-Javadoc) - * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) - */ - /* - public boolean onKeyDown(int keyCode, KeyEvent event){ - - //yeah this should probably go away now :) - or not - if(keyCode==KeyEvent.KEYCODE_BACK){ - - if(currentView != R.layout.layout_main){ - - showMain (); - return true; - } - else{ - return super.onKeyDown(keyCode, event); - } - } - - return super.onKeyDown(keyCode, event); - - }*/ - /* (non-Javadoc) * @see android.app.Activity#onPause() */ @@ -405,7 +378,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants int hsPort = getIntent().getIntExtra("hs_port", -1); - String requestMsg = "An app wants to open a server port (" + hsPort + ") to the Tor network. This is safe if you trust the app."; + String requestMsg = getString(R.string.hidden_service_request, hsPort); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener) .setNegativeButton("Deny", dialogClickListener).show(); @@ -499,61 +472,62 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants /* * Load the basic settings application to display torrc */ - private void showSettings () - { - - startActivityForResult(new Intent(this, SettingsPreferences.class), 1); - } - - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - //if we get a response from an activity we launched (like from line 527 where we launch the Settings/Prefs screen) - //and the resultCode matches our arbitrary 1010 value, AND Tor is running - //then update the preferences in an async background task - if (requestCode == 1 && resultCode == 1010 && mService != null) - { - new ProcessSettingsAsyncTask().execute(mService); - } - } - - AlertDialog aDialog = null; - - //general alert dialog for mostly Tor warning messages - //sometimes this can go haywire or crazy with too many error - //messages from Tor, and the user cannot stop or exit Orbot - //so need to ensure repeated error messages are not spamming this method - private void showAlert(String title, String msg, boolean button) - { - try - { - if (aDialog != null && aDialog.isShowing()) - aDialog.dismiss(); - } - catch (Exception e){} //swallow any errors - - if (button) - { - aDialog = new AlertDialog.Builder(this) - .setIcon(R.drawable.icon) - .setTitle(title) - .setMessage(msg) - .setPositiveButton(android.R.string.ok, null) - .show(); - } - else - { - aDialog = new AlertDialog.Builder(this) - .setIcon(R.drawable.icon) - .setTitle(title) - .setMessage(msg) - .show(); - } - - aDialog.setCanceledOnTouchOutside(true); - } + private void showSettings () + { + + startActivityForResult(new Intent(this, SettingsPreferences.class), 1); + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + //if we get a response from an activity we launched (like from line 527 where we launch the Settings/Prefs screen) + //and the resultCode matches our arbitrary 1010 value, AND Tor is running + //then update the preferences in an async background task + if (requestCode == 1 && resultCode == 1010 && mService != null) + { + new ProcessSettingsAsyncTask().execute(mService); + } + } + + AlertDialog aDialog = null; + + //general alert dialog for mostly Tor warning messages + //sometimes this can go haywire or crazy with too many error + //messages from Tor, and the user cannot stop or exit Orbot + //so need to ensure repeated error messages are not spamming this method + private void showAlert(String title, String msg, boolean button) + { + try + { + if (aDialog != null && aDialog.isShowing()) + aDialog.dismiss(); + } + catch (Exception e){} //swallow any errors + + if (button) + { + aDialog = new AlertDialog.Builder(this) + .setIcon(R.drawable.icon) + .setTitle(title) + .setMessage(msg) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + else + { + aDialog = new AlertDialog.Builder(this) + .setIcon(R.drawable.icon) + .setTitle(title) + .setMessage(msg) + .show(); + } + + aDialog.setCanceledOnTouchOutside(true); + } + /* * Set the state of the running/not running graphic and label * this all needs to be looked at w/ the shift to progressDialog @@ -875,6 +849,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } //unbind removes the callback, and unbinds the service + /* private void unbindService () { if (mIsBound) { @@ -898,7 +873,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants mIsBound = false; } - } + }*/ private void createProgressDialog (String msg) {

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 Nov '11

14 Nov '11

commit 9f060d031b1fa5129380a9d370cfe5a35fca421b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 14 09:15:26 2011 +0000 Update translations for vidalia_help --- de/services.po | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/de/services.po b/de/services.po index 47ed8e3..e85602a 100644 --- a/de/services.po +++ b/de/services.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-14 08:44+0000\n" +"PO-Revision-Date: 2011-11-14 09:10+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -101,6 +101,8 @@ msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." msgstr "" +"Konfigurieren Sie den Hidden Service so das Tor Relay Anfragen von Tor-" +"Benutzern zu Ihrem lokalen Server durchgehen." #. type: Content of: <html><body><p> #: en/services.html:50 @@ -108,16 +110,19 @@ msgid "" "There is a fine tutorial on the Tor website (https://www.torproject.org/docs" "/tor-hidden-service.html) that describes these steps in more detail." msgstr "" +"Es gibt eine hervorragende Anleitung auf der Tor Webseite " +"(https://www.torproject.org/docs/tor-hidden-service.html) das die Schritte " +"ausführlich beschreibt." #. type: Content of: <html><body> #: en/services.html:55 msgid "<a name=\"data\"/>" -msgstr "" +msgstr "<a name=\"data\"/>" #. type: Content of: <html><body><h3> #: en/services.html:56 msgid "What data do I need to provide?" -msgstr "" +msgstr "Welche Daten muß ich zur Verfügung stellen ?" #. type: Content of: <html><body><p> #: en/services.html:58 @@ -125,6 +130,8 @@ msgid "" "The services table contains five columns containing data about configured " "hidden services:" msgstr "" +"Die Service-Tabelle beinhaltet 5 Spalten die Daten über die konfigurierten " +"Hidden Services enthalten:" #. type: Content of: <html><body><p><ul><li> #: en/services.html:61 @@ -189,17 +196,18 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:103 msgid "<a name=\"buttons\"/>" -msgstr "" +msgstr "<a name=\"buttons\"/>" #. type: Content of: <html><body><h3> #: en/services.html:104 msgid "What are the five buttons used for?" -msgstr "" +msgstr "Wofür werden die Buttons benötigt ?" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107 msgid "Add service: Creates a new empty service configuration." msgstr "" +"Service hinzufügen: Erstelle eine neue, leere Service Konfigurations-Datei" #. type: Content of: <html><body><p><ul><li> #: en/services.html:108 @@ -223,7 +231,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:119 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/services.html:120 @@ -251,7 +259,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:135 msgid "<a name=\"client\"/>" -msgstr "" +msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 14 Nov '11

14 Nov '11

commit ea5151ad070047d5589a5e247dacc144215887c0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 14 08:45:21 2011 +0000 Update translations for vidalia_help --- de/services.po | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/de/services.po b/de/services.po index 134488c..47ed8e3 100644 --- a/de/services.po +++ b/de/services.po @@ -2,13 +2,14 @@ # Translators: # bastik <bastik.tor(a)googlemail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# <sebastian(a)urbach.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-04-16 20:48+0000\n" -"Last-Translator: bastik <bastik.tor(a)googlemail.com>\n" +"PO-Revision-Date: 2011-11-14 08:44+0000\n" +"Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,6 +52,10 @@ msgid "" "provide a hidden service is built on top of the same circuits that Tor uses " "for anonymous browsing and roughly has similar anonymity properties." msgstr "" +"Die Option versteckte Dienste bietet die Möglichkeit beliebige TCP-basierte " +"Dienste anzubieten ohne die eigene IP-Adresse zu veröffentlichen. Das " +"Protokoll für diese Dienste ist auf dem TOR-Protokoll aufgebaut das zum " +"anonymen browsen verwendet wird und hat ungefähr die gleichen Eigenschaften." #. type: Content of: <html><body><p> #: en/services.html:35 @@ -59,11 +64,14 @@ msgid "" "Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous " "Specification (doc/spec/rend-spec.txt)." msgstr "" +"Um mehr Informationen zu den Hidden Services zu bekommen sollten Sie Sektion" +" 5 des Tor Design Papiers lesen (doc/design-paper/tor-design.pdf) oder das " +"Papier zum Thema Redenzvous Spezifikationen " #. type: Content of: <html><body> #: en/services.html:40 msgid "<a name=\"provide\"/>" -msgstr "" +msgstr "<a name=\"provide\"/>" #. type: Content of: <html><body><h3> #: en/services.html:41 @@ -83,6 +91,9 @@ msgid "" "Install a web server locally (or a server for whatever service you want to " "provide, e.g. IRC) to listen for local requests." msgstr "" +"Installieren Sie einen lokalen Web-Server (oder einen Server für den " +"entsprechenden Service den Sie anbieten wollen wie z.B. IRC) der auf lokale " +"Verbindungen wartet." #. type: Content of: <html><body><p><ol><li> #: en/services.html:47

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 14 Nov '11

14 Nov '11

commit f27c2d76c13858456c0f9b5f05532aedce28303b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 14 04:15:11 2011 +0000 Update translations for gettor --- ar/gettor.po | 18 +++++++++++++++--- cy/gettor.po | 18 +++++++++++++++--- da/gettor.po | 20 +++++++++++++++----- de/gettor.po | 20 +++++++++++++++----- el/gettor.po | 18 +++++++++++++++--- es/gettor.po | 21 +++++++++++++++------ fa/gettor.po | 18 +++++++++++++++--- fr/gettor.po | 21 +++++++++++++++------ hu/gettor.po | 20 +++++++++++++++----- it/gettor.po | 18 +++++++++++++++--- nl/gettor.po | 21 +++++++++++++++------ pl/gettor.po | 20 +++++++++++++++----- ru/gettor.po | 16 ++++++++++++++-- templates/gettor.pot | 25 ++++++++++++++++++++++--- 14 files changed, 216 insertions(+), 58 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index 7b921b2..a7122a7 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-20 18:07+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: redeemer <fadi.redeemer.mansour(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -548,4 +548,16 @@ msgstr "" msgid "ANSWER:" msgstr "" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/cy/gettor.po b/cy/gettor.po index d591e25..eb4c327 100644 --- a/cy/gettor.po +++ b/cy/gettor.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-09-11 00:43+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: cymro <markives(a)hotmail.co.uk>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -441,4 +441,16 @@ msgstr "" msgid "ANSWER:" msgstr "" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/da/gettor.po b/da/gettor.po index 288b505..1e6f902 100644 --- a/da/gettor.po +++ b/da/gettor.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-09 22:37+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: OliverMller <theoliver(a)live.co.uk>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -60,10 +60,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Hvis du har spørgsmål, eller det ikke virker, kan du kontakte en person på " -"denne støtte e-mail-adresse: community-support(a)lists.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -617,4 +615,16 @@ msgstr "SPØRGSMÅL:" msgid "ANSWER:" msgstr "SVAR:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/de/gettor.po b/de/gettor.po index b724046..3871b1e 100644 --- a/de/gettor.po +++ b/de/gettor.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-09-21 14:37+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: cyberfork <benni(a)include-benni.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -60,10 +60,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Solltest du fragen haben oder etwas nicht funktionieren kannst du hier über " -"die Email Adresse community-support(a)lists.torproject.org Support anfordern." #: lib/gettor/i18n.py:46 msgid "" @@ -595,4 +593,16 @@ msgstr "FRAGE:" msgid "ANSWER:" msgstr "ANTWORT:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/el/gettor.po b/el/gettor.po index 7a72a2b..cbd9636 100644 --- a/el/gettor.po +++ b/el/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-23 13:48+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: anestv <varsamidis7-etc(a)yahoo.gr>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -463,4 +463,16 @@ msgstr "" msgid "ANSWER:" msgstr "" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/es/gettor.po b/es/gettor.po index 83d75df..059ac8d 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-20 05:47+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: lenazun <lenazun(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -60,11 +60,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Si tiene alguna pregunta o el sistema no funciona, puede ponerse en contacto" -" con una persona en esta dirección de correo de soporte: community-" -"support(a)lists.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -597,4 +594,16 @@ msgstr "PREGUNTA:" msgid "ANSWER:" msgstr "RESPUESTA:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/fa/gettor.po b/fa/gettor.po index 1d4dd15..035e4de 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-09-11 00:43+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: behravan <behravanhamed(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -484,4 +484,16 @@ msgstr "" msgid "ANSWER:" msgstr "" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/fr/gettor.po b/fr/gettor.po index 8ead25f..bb4ea67 100644 --- a/fr/gettor.po +++ b/fr/gettor.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-26 20:03+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -64,11 +64,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Si vous avez des questions ou qu'il ne fonctionne pas, vous pouvez joindre " -"un humain à cette adresse email du support: community-" -"support(a)lists.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -606,4 +603,16 @@ msgstr "QUESTION:" msgid "ANSWER:" msgstr "REPONSE:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/hu/gettor.po b/hu/gettor.po index 713c784..59bd70f 100644 --- a/hu/gettor.po +++ b/hu/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-01 10:41+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -59,10 +59,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Ha kérdése van vagy nem működik, elérhet egy embert ezen az email címen: " -"community-support(a)lists.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -592,4 +590,16 @@ msgstr "KÉRDÉS:" msgid "ANSWER:" msgstr "VÁLASZ:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/it/gettor.po b/it/gettor.po index 618b1b5..e465588 100644 --- a/it/gettor.po +++ b/it/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-10 15:59+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: jeckodevelopment <luca(a)jeckodevelopment.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -459,4 +459,16 @@ msgstr "" msgid "ANSWER:" msgstr "" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/nl/gettor.po b/nl/gettor.po index 839ee3b..fdd6a85 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-10-12 22:43+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -61,11 +61,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Als je een vraag hebt of het werkt niet, dan kan je in contact komen met een" -" mens bij dit ondersteunings-e-mailadres: community-" -"support(a)lists.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -595,4 +592,16 @@ msgstr "VRAAG:" msgid "ANSWER:" msgstr "ANTWOORD:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/pl/gettor.po b/pl/gettor.po index 72bf1a1..b697173 100644 --- a/pl/gettor.po +++ b/pl/gettor.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" -"PO-Revision-Date: 2011-09-11 10:59+0000\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-14 04:06+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -60,10 +60,8 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" -"Jeśli masz pytania lub to nie działa, możesz skontaktować się z\n" -"człowiekiem pod tym adresem: community-support(a)lists.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -601,4 +599,16 @@ msgstr "PYTANIE:" msgid "ANSWER:" msgstr "ODPOWIEDŹ:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/ru/gettor.po b/ru/gettor.po index cd59b08..2ac98d0 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" "PO-Revision-Date: 2010-11-30 05:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" @@ -50,7 +50,7 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" #: lib/gettor/i18n.py:46 @@ -441,4 +441,16 @@ msgstr "" msgid "ANSWER:" msgstr "" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" + diff --git a/templates/gettor.pot b/templates/gettor.pot index 32a72c6..282e40c 100644 --- a/templates/gettor.pot +++ b/templates/gettor.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-10 01:52-0400\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" "PO-Revision-Date: 2010-11-30 05:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -58,10 +58,10 @@ msgstr "" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" msgstr "" "If you have any questions or it doesn't work, you can contact a\n" -"human at this support email address: community-support(a)lists.torproject.org" +"human at this support email address: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -606,4 +606,23 @@ msgstr "QUESTION:" msgid "ANSWER:" msgstr "ANSWER:" +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +

1 0

[stem/master] Header documentation for the proc and system utils
by atagar＠torproject.org 14 Nov '11

14 Nov '11

commit dbe041ac1bbb775f71f34f0d705d4dd654d74858 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 16:21:09 2011 -0800 Header documentation for the proc and system utils --- stem/util/proc.py | 9 +++++++++ stem/util/system.py | 9 +++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index 79cf92a..32ab920 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -11,6 +11,15 @@ https://code.google.com/p/psutil/ which was written by Jay Loden, Dave Daeschler, Giampaolo Rodola' and is under the BSD license. + +is_available - checks if proc utilities can be used on this system +get_system_start_time - unix timestamp for when the system started +get_physical_memory - memory available on this system +get_cwd - provides the current working directory for a process +get_uid - provides the user id a process is running under +get_memory_usage - provides the memory usage of a process +get_stats - queries statistics about a process +get_connections - provides the connections made by a process """ import os diff --git a/stem/util/system.py b/stem/util/system.py index fd7277d..e5ba367 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1,6 +1,15 @@ """ Helper functions for working with the underlying system. These are mostly os dependent, only working on linux, osx, and bsd. + +is_available - determines if a command is availabe on this system +is_running - determines if a given process is running +get_pid - provides the process id a given process is running under +get_cwd - provides the current working directory for a given process +get_bsd_jail_id - provides the BSD jail id a given process is running within +is_relative_path - checks if a given path can be expanded by expand_path +expand_path - expands relative paths and ~ entries +call - runs the given system command and provides back the results """ import re

1 0

[stem/master] Basic integ test for stem.util.conf
by atagar＠torproject.org 14 Nov '11

14 Nov '11

commit 382bc5627b8d4f29645207628ca224f08f7b6883 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 16:13:33 2011 -0800 Basic integ test for stem.util.conf Adding an integ test for the example given by the conf utility. There's a whole lot more that could be tested in that class (especially parsing and type inferences) but this doesn't seem too worth while so just adding this basic test for now. I might expand it later. --- run_tests.py | 2 + test/integ/util/conf.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/run_tests.py b/run_tests.py index 7dcffaf..774c130 100755 --- a/run_tests.py +++ b/run_tests.py @@ -18,6 +18,7 @@ import test.unit.types.version import test.unit.connection.protocolinfo_response import test.unit.util.enum import test.integ.types.control_message +import test.integ.util.conf import test.integ.util.system import stem.util.enum @@ -36,6 +37,7 @@ UNIT_TESTS = (("stem.types.ControlMessage", test.unit.types.control_message.Test ) INTEG_TESTS = (("stem.types.ControlMessage", test.integ.types.control_message.TestControlMessage), + ("stem.util.conf", test.integ.util.conf.TestConf), ("stem.util.system", test.integ.util.system.TestSystem), ) diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py new file mode 100644 index 0000000..03ac4a1 --- /dev/null +++ b/test/integ/util/conf.py @@ -0,0 +1,54 @@ +""" +Integration tests for the stem.util.conf class and functions. +""" + +import os +import tempfile +import unittest + +import stem.util.conf + +CONF_PATH = tempfile.mktemp("-conf-test") +CONF_HEADER = """# Demo configuration for integration tests to run against. Nothing to see here, +# move along, move along. +""" + +EXAMPLE_CONF = """%s +destination.ip 1.2.3.4 +destination.port blarg + +startup.run export PATH=$PATH:~/bin +startup.run alias l=ls +""" % CONF_HEADER + +class TestConf(unittest.TestCase): + def tearDown(self): + # cleans up test configurations we made + if os.path.exists(CONF_PATH): + os.remove(CONF_PATH) + + def test_example(self): + """ + Checks that the pydoc example is correct. + """ + + test_conf_file = open(CONF_PATH, "w") + test_conf_file.write(EXAMPLE_CONF) + test_conf_file.close() + + ssh_config = {"login.user": "atagar", + "login.password": "pepperjack_is_awesome!", + "destination.ip": "127.0.0.1", + "destination.port": 22, + "startup.run": []} + + user_config = stem.util.conf.get_config("integ-ssh_login") + user_config.load(CONF_PATH) + user_config.update(ssh_config) + + self.assertEquals("atagar", ssh_config["login.user"]) + self.assertEquals("pepperjack_is_awesome!", ssh_config["login.password"]) + self.assertEquals("1.2.3.4", ssh_config["destination.ip"]) + self.assertEquals(22, ssh_config["destination.port"]) + self.assertEquals(["export PATH=$PATH:~/bin", "alias l=ls"], ssh_config["startup.run"]) +

1 0

[stem/master] Revising enum docs and methods
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit db7635abc7878d873a989c35e7aea413ecde2f52 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 14:38:56 2011 -0800 Revising enum docs and methods Minor changes including... - standard header documentation - replacing the keys() method with making enums iterable (functionally the same, but a little nicer for callers) - dropping the alternative LEnum - I've never used it --- stem/util/enum.py | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/stem/util/enum.py b/stem/util/enum.py index d7745ec..6ce54d0 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -5,7 +5,7 @@ constructed as simple type listings, ie: >>> insects.ANT 'Ant' >>> insects.values() -['Ant', 'Wasp', 'Ladybug', 'Firefly'] +('Ant', 'Wasp', 'Ladybug', 'Firefly') with overwritten string counterparts: >>> pets = Enum(("DOG", "Skippy"), "CAT", ("FISH", "Nemo")) @@ -14,10 +14,13 @@ with overwritten string counterparts: >>> pets.CAT 'Cat' -or with entirely custom string components as an unordered enum with: ->>> pets = LEnum(DOG="Skippy", CAT="Kitty", FISH="Nemo") ->>> pets.CAT -'Kitty' +to_camel_case - converts a string to camel case +Enum - Provides a basic, ordered enumeration. + |- values - string representation of our enums + |- index_of - indice of an enum value + |- next - provides the enum after a given enum value + |- previous - provides the enum before a given value + +- __iter__ - iterator over our enum keys """ def to_camel_case(label, word_divider = " "): @@ -62,16 +65,6 @@ class Enum: self._keys = tuple(keys) self._values = tuple(values) - def keys(self): - """ - Provides an ordered listing of the enumeration keys in this set. - - Returns: - tuple with our enum keys - """ - - return self._keys - def values(self): """ Provides an ordered listing of the enumerations in this set. @@ -137,14 +130,12 @@ class Enum: prev_index = (self._values.index(value) - 1) % len(self._values) return self._values[prev_index] - -class LEnum(Enum): - """ - Enumeration that accepts custom string mappings. - """ - def __init__(self, **args): - Enum.__init__(self) - self.__dict__.update(args) - self._values = sorted(args.values()) + def __iter__(self): + """ + Provides an ordered listing of the enumeration keys in this set. + """ + + for entry in self._keys: + yield entry

1 0

[stem/master] Unit tests for PROTOCOLINFO responses
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit 2b797d0ba9310a015bef5bc2605020ebe8ffafdd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 13:15:49 2011 -0800 Unit tests for PROTOCOLINFO responses --- run_tests.py | 2 + stem/connection.py | 10 +- test/unit/connection/__init__.py | 6 + test/unit/connection/protocolinfo_response.py | 144 +++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 4 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0b86706..1107a59 100755 --- a/run_tests.py +++ b/run_tests.py @@ -15,6 +15,7 @@ import test.runner import test.unit.types.control_message import test.unit.types.control_line import test.unit.types.version +import test.unit.connection.protocolinfo_response import test.integ.message import test.integ.system @@ -29,6 +30,7 @@ DIVIDER = "=" * 70 UNIT_TESTS = (("stem.types.ControlMessage", test.unit.types.control_message.TestControlMessage), ("stem.types.ControlLine", test.unit.types.control_line.TestControlLine), ("stem.types.Version", test.unit.types.version.TestVerion), + ("stem.connection.ProtocolInfoResponse", test.unit.connection.protocolinfo_response.TestProtocolInfoResponse), ) INTEG_TESTS = (("stem.types.ControlMessage", test.integ.message.TestMessageFunctions), diff --git a/stem/connection.py b/stem/connection.py index d17efde..2b96899 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -53,7 +53,8 @@ class ProtocolInfoResponse(stem.types.ControlMessage): def convert(control_message): """ - Parses a ControlMessage, converting it into a ProtocolInfoResponse. + Parses a ControlMessage, performing an in-place conversion of it into a + ProtocolInfoResponse. Arguments: control_message (stem.types.ControlMessage) - @@ -61,7 +62,7 @@ class ProtocolInfoResponse(stem.types.ControlMessage): Raises: stem.types.ProtocolError the message isn't a proper PROTOCOLINFO response - ValueError if argument is of the wrong type + TypeError if argument isn't a ControlMessage """ if isinstance(control_message, stem.types.ControlMessage): @@ -69,7 +70,7 @@ class ProtocolInfoResponse(stem.types.ControlMessage): control_message._parse_message() return control_message else: - raise ValueError("Only able to convert stem.types.ControlMessage instances") + raise TypeError("Only able to convert stem.types.ControlMessage instances") convert = staticmethod(convert) @@ -152,7 +153,7 @@ class ProtocolInfoResponse(stem.types.ControlMessage): # parse optional COOKIEFILE mapping (quoted and can have escapes) if line.is_next_mapping("COOKIEFILE", True, True): - self.cookie_file = line.pop_mapping(True, True)[0] + self.cookie_file = line.pop_mapping(True, True)[1] # attempt to expand relative cookie paths if stem.util.system.is_relative_path(self.cookie_file): @@ -286,6 +287,7 @@ class ControlConnection: while self.is_running(): try: + # TODO: this raises a SocketClosed when... well, the socket is closed control_message = stem.types.read_message(self._control_socket_file) if control_message.content()[-1][0] == "650": diff --git a/test/unit/connection/__init__.py b/test/unit/connection/__init__.py new file mode 100644 index 0000000..440773e --- /dev/null +++ b/test/unit/connection/__init__.py @@ -0,0 +1,6 @@ +""" +Unit tests for stem.connection. +""" + +__all__ = ["protocolinfo_response"] + diff --git a/test/unit/connection/protocolinfo_response.py b/test/unit/connection/protocolinfo_response.py new file mode 100644 index 0000000..0dcde95 --- /dev/null +++ b/test/unit/connection/protocolinfo_response.py @@ -0,0 +1,144 @@ +""" +Unit tests for the stem.connection.ProtocolInfoResponse class. +""" + +import unittest +import StringIO +import stem.connection +import stem.types + +NO_AUTH = """250-PROTOCOLINFO 1 +250-AUTH METHODS=NULL +250-VERSION Tor="0.2.1.30" +250 OK +""".replace("\n", "\r\n") + +PASSWORD_AUTH = """250-PROTOCOLINFO 1 +250-AUTH METHODS=HASHEDPASSWORD +250-VERSION Tor="0.2.1.30" +250 OK +""".replace("\n", "\r\n") + +COOKIE_AUTH = r"""250-PROTOCOLINFO 1 +250-AUTH METHODS=COOKIE COOKIEFILE="/tmp/my data\\\"dir//control_auth_cookie" +250-VERSION Tor="0.2.1.30" +250 OK +""".replace("\n", "\r\n") + +MULTIPLE_AUTH = """250-PROTOCOLINFO 1 +250-AUTH METHODS=COOKIE,HASHEDPASSWORD COOKIEFILE="/home/atagar/.tor/control_auth_cookie" +250-VERSION Tor="0.2.1.30" +250 OK +""".replace("\n", "\r\n") + +UNKNOWN_AUTH = """250-PROTOCOLINFO 1 +250-AUTH METHODS=MAGIC,HASHEDPASSWORD,PIXIE_DUST +250-VERSION Tor="0.2.1.30" +250 OK +""".replace("\n", "\r\n") + +MINIMUM_RESPONSE = """250-PROTOCOLINFO 5 +250 OK +""".replace("\n", "\r\n") + +class TestProtocolInfoResponse(unittest.TestCase): + """ + Tests the parsing of ControlMessages for PROTOCOLINFO responses. + """ + + def test_convert(self): + """ + Exercises functionality of the convert method both when it works and + there's an error. + """ + + # working case + control_message = stem.types.read_message(StringIO.StringIO(NO_AUTH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + + # now this should be a ProtocolInfoResponse (ControlMessage subclass) + self.assertTrue(isinstance(control_message, stem.types.ControlMessage)) + self.assertTrue(isinstance(control_message, stem.connection.ProtocolInfoResponse)) + + # exercise some of the ControlMessage functionality + self.assertTrue(str(control_message).startswith("PROTOCOLINFO 1")) + self.assertEquals(NO_AUTH, control_message.raw_content()) + + # attempt to convert the wrong type + self.assertRaises(TypeError, stem.connection.ProtocolInfoResponse.convert, "hello world") + + # attempt to convert a different message type + bw_event_control_message = stem.types.read_message(StringIO.StringIO("650 BW 32326 2856\r\n")) + self.assertRaises(stem.types.ProtocolError, stem.connection.ProtocolInfoResponse.convert, bw_event_control_message) + + def test_no_auth(self): + """ + Checks a response when there's no authentication. + """ + + control_message = stem.types.read_message(StringIO.StringIO(NO_AUTH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + + self.assertEquals(1, control_message.protocol_version) + self.assertEquals(stem.types.Version("0.2.1.30"), control_message.tor_version) + self.assertEquals((stem.connection.AuthMethod.NONE, ), control_message.auth_methods) + self.assertEquals((), control_message.unknown_auth_methods) + self.assertEquals(None, control_message.cookie_file) + self.assertEquals(None, control_message.socket) + + def test_password_auth(self): + """ + Checks a response with password authentication. + """ + + control_message = stem.types.read_message(StringIO.StringIO(PASSWORD_AUTH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + self.assertEquals((stem.connection.AuthMethod.PASSWORD, ), control_message.auth_methods) + + def test_cookie_auth(self): + """ + Checks a response with cookie authentication and a path including escape + characters. + """ + + control_message = stem.types.read_message(StringIO.StringIO(COOKIE_AUTH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + self.assertEquals((stem.connection.AuthMethod.COOKIE, ), control_message.auth_methods) + self.assertEquals("/tmp/my data\\\"dir//control_auth_cookie", control_message.cookie_file) + + def test_multiple_auth(self): + """ + Checks a response with multiple authentication methods. + """ + + control_message = stem.types.read_message(StringIO.StringIO(MULTIPLE_AUTH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + self.assertEquals((stem.connection.AuthMethod.COOKIE, stem.connection.AuthMethod.PASSWORD), control_message.auth_methods) + self.assertEquals("/home/atagar/.tor/control_auth_cookie", control_message.cookie_file) + + def test_unknown_auth(self): + """ + Checks a response with an unrecognized authtentication method. + """ + + control_message = stem.types.read_message(StringIO.StringIO(UNKNOWN_AUTH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + self.assertEquals((stem.connection.AuthMethod.UNKNOWN, stem.connection.AuthMethod.PASSWORD), control_message.auth_methods) + self.assertEquals(("MAGIC", "PIXIE_DUST"), control_message.unknown_auth_methods) + + def test_minimum_response(self): + """ + Checks a PROTOCOLINFO response that only contains the minimum amount of + information to be a valid response. + """ + + control_message = stem.types.read_message(StringIO.StringIO(MINIMUM_RESPONSE)) + stem.connection.ProtocolInfoResponse.convert(control_message) + + self.assertEquals(5, control_message.protocol_version) + self.assertEquals(None , control_message.tor_version) + self.assertEquals((), control_message.auth_methods) + self.assertEquals((), control_message.unknown_auth_methods) + self.assertEquals(None, control_message.cookie_file) + self.assertEquals(None, control_message.socket) +

1 0

[stem/master] Including stem prefix for paths in stem comments
by atagar＠torproject.org 13 Nov '11

13 Nov '11

commit fc562144fd8a333ad517575976328bc2dc3cec5d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 13 13:43:59 2011 -0800 Including stem prefix for paths in stem comments --- test/integ/message.py | 4 ++-- test/integ/system.py | 13 +++++++------ test/unit/types/control_line.py | 4 ++-- test/unit/types/control_message.py | 6 +++--- test/unit/types/version.py | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/test/integ/message.py b/test/integ/message.py index a562f86..a8e722d 100644 --- a/test/integ/message.py +++ b/test/integ/message.py @@ -1,5 +1,5 @@ """ -Integration tests for the types.ControlMessage class. +Integration tests for the stem.types.ControlMessage class. """ import re @@ -11,7 +11,7 @@ import test.runner class TestMessageFunctions(unittest.TestCase): """ - Exercises the 'types.ControlMessage' class with an actual tor instance. + Exercises the 'stem.types.ControlMessage' class with an actual tor instance. """ def test_unestablished_socket(self): diff --git a/test/integ/system.py b/test/integ/system.py index 09ffd24..32ac892 100644 --- a/test/integ/system.py +++ b/test/integ/system.py @@ -1,5 +1,5 @@ """ -Unit tests for the util.system functions in the context of a tor process. +Unit tests for the stem.util.system functions in the context of a tor process. """ import os @@ -10,12 +10,13 @@ import stem.util.system as system class TestSystemFunctions(unittest.TestCase): """ - Tests the util.system functions against the tor process that we're running. + Tests the stem.util.system functions against the tor process that we're + running. """ def test_is_available(self): """ - Checks the util.system.is_available function. + Checks the stem.util.system.is_available function. """ # since we're running tor it would be kinda sad if this didn't detect it @@ -26,7 +27,7 @@ class TestSystemFunctions(unittest.TestCase): def test_is_running(self): """ - Checks the util.system.is_running function. + Checks the stem.util.system.is_running function. """ self.assertTrue(system.is_running("tor")) @@ -34,7 +35,7 @@ class TestSystemFunctions(unittest.TestCase): def test_get_pid(self): """ - Checks the util.system.get_pid function. + Checks the stem.util.system.get_pid function. """ runner = test.runner.get_runner() @@ -43,7 +44,7 @@ class TestSystemFunctions(unittest.TestCase): def test_get_cwd(self): """ - Checks the util.system.get_cwd function. + Checks the stem.util.system.get_cwd function. """ # tor's pwd will match our process since we started it diff --git a/test/unit/types/control_line.py b/test/unit/types/control_line.py index bacda76..0c324e5 100644 --- a/test/unit/types/control_line.py +++ b/test/unit/types/control_line.py @@ -1,5 +1,5 @@ """ -Unit tests for the types.ControlLine class. +Unit tests for the stem.types.ControlLine class. """ import unittest @@ -15,7 +15,7 @@ PROTOCOLINFO_RESPONSE = ( class TestControlLine(unittest.TestCase): """ - Tests methods of the types.ControlLine class. + Tests methods of the stem.types.ControlLine class. """ def test_pop_examples(self): diff --git a/test/unit/types/control_message.py b/test/unit/types/control_message.py index 5e9b7bc..af8fa00 100644 --- a/test/unit/types/control_message.py +++ b/test/unit/types/control_message.py @@ -1,5 +1,5 @@ """ -Unit tests for the types.ControlMessage parsing and class. +Unit tests for the stem.types.ControlMessage parsing and class. """ import socket @@ -31,7 +31,7 @@ version -- The current version of Tor. class TestControlMessage(unittest.TestCase): """ - Tests methods and functions related to 'types.ControlMessage'. This uses + Tests methods and functions related to 'stem.types.ControlMessage'. This uses StringIO to make 'files' to mock socket input. """ @@ -163,7 +163,7 @@ class TestControlMessage(unittest.TestCase): Performs some basic sanity checks that a reply mirrors its parsed result. Returns: - types.ControlMessage for the given input + stem.types.ControlMessage for the given input """ message = stem.types.read_message(StringIO.StringIO(controller_reply)) diff --git a/test/unit/types/version.py b/test/unit/types/version.py index fb04641..309ee07 100644 --- a/test/unit/types/version.py +++ b/test/unit/types/version.py @@ -1,5 +1,5 @@ """ -Unit tests for the types.Version parsing and class. +Unit tests for the stem.types.Version parsing and class. """ import unittest @@ -7,7 +7,7 @@ import stem.types class TestVerion(unittest.TestCase): """ - Tests methods and functions related to 'types.Version'. + Tests methods and functions related to 'stem.types.Version'. """ def test_parsing(self):

1 0