- tor-commits - lists.torproject.org

[orbot/master] cleaned up binding and logging
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 493d6e22cdcd7f4836589c696b5c1f2aeb534847 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:09:33 2012 -0500 cleaned up binding and logging --- src/org/torproject/android/Orbot.java | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 94807e4..b54c05e 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -284,7 +284,6 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { switch (which){ case DialogInterface.BUTTON_POSITIVE: @@ -340,9 +339,9 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants protected void onResume() { super.onResume(); - bindService(); + if (!mIsBound) + bindService(); - if (getIntent() == null) return; @@ -355,7 +354,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants { DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - @Override + public void onClick(DialogInterface dialog, int which) { switch (which){ case DialogInterface.BUTTON_POSITIVE: @@ -401,11 +400,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } else { - - //setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version)); - - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - mNotificationManager.cancelAll(); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -722,14 +717,14 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants mHandler.sendMessage(msg); } - @Override //this was when we displayed the log in the main Activity; can prob take this out now - public void logMessage(String value) throws RemoteException { - - Message msg = mHandler.obtainMessage(TorServiceConstants.LOG_MSG); - msg.getData().putString(HANDLER_TOR_MSG, value); - mHandler.sendMessage(msg); - - } + + public void logMessage(String value) throws RemoteException { + + Message msg = mHandler.obtainMessage(TorServiceConstants.LOG_MSG); + msg.getData().putString(HANDLER_TOR_MSG, value); + mHandler.sendMessage(msg); + + } };

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Jan '12

25 Jan '12

commit c665b1cd31af6ae8469cac0de573406be911c75c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 25 22:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 07b41b7..3efcc70 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-25 22:15+0000\n" +"PO-Revision-Date: 2012-01-25 22:41+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1628,7 +1628,7 @@ msgstr "Unknown" msgctxt "MainWindow" msgid "Start Tor" -msgstr "راه اندازی تُر" +msgstr "راه اندازی تور" msgctxt "MainWindow" msgid "Exit" @@ -1656,7 +1656,7 @@ msgstr "تنظیمات" msgctxt "MainWindow" msgid "About" -msgstr "درباره‌ی" +msgstr "درباره‌" msgctxt "MainWindow" msgid "Help" @@ -1668,27 +1668,27 @@ msgstr "هویت جدید" msgctxt "MainWindow" msgid "Ctrl+T" -msgstr "کنترل + T" +msgstr "Crtl+T" msgctxt "MainWindow" msgid "Ctrl+B" -msgstr "کنترل + B" +msgstr "Ctrl+B" msgctxt "MainWindow" msgid "Ctrl+L" -msgstr "کنترل + L" +msgstr "Ctrl+L" msgctxt "MainWindow" msgid "Ctrl+N" -msgstr "کنترل + N" +msgstr "Ctrl+N" msgctxt "MainWindow" msgid "Ctrl+?" -msgstr "کنترل + ?" +msgstr "Ctrl+?" msgctxt "MainWindow" msgid "Ctrl+I" -msgstr "کنترل + I" +msgstr "Ctrl+I" msgctxt "MainWindow" msgid "Ctrl+P" @@ -1696,7 +1696,7 @@ msgstr "Ctrl+P" msgctxt "MainWindow" msgid "Tor" -msgstr "تُر" +msgstr "تور" msgctxt "MainWindow" msgid "View" @@ -1716,7 +1716,7 @@ msgstr "ویدالیا قادر به راه اندازی مرورگر وب پی msgctxt "MainWindow" msgid "Error starting IM client" -msgstr "خطای راه اندازی کاربر IM" +msgstr "خطای راه اندازی کلاینت IM" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured IM client" @@ -1724,7 +1724,7 @@ msgstr "ویدالیا نتوانست کاربر IM پیکربندی شده را msgctxt "MainWindow" msgid "Error starting proxy server" -msgstr "خطا در هنگام راه اندازی پیشکار" +msgstr "خطا در هنگام راه اندازی سرور پروکسی" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured proxy server" @@ -1740,7 +1740,7 @@ msgstr "برپایی یک اتصال فهرست رمزبندی شده" msgctxt "MainWindow" msgid "Retrieving network status" -msgstr "دریافت وضعیت شبکه" +msgstr "بازیابی وضعیت شبکه" msgctxt "MainWindow" msgid "Loading network status" @@ -1760,15 +1760,15 @@ msgstr "بارگذاری اطلاعات بازپخش" msgctxt "MainWindow" msgid "Connecting to the Tor network" -msgstr "اتصال به شبکه تُر" +msgstr "در حال اتصال به شبکه تور" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "برپایی یک جریان تُر" +msgstr "برپایی یک جریان تور" msgctxt "MainWindow" msgid "Connected to the Tor network!" -msgstr "وصل شده به شبکه تُر" +msgstr "وصل شده به شبکه تور" msgctxt "MainWindow" msgid "Unrecognized startup status" @@ -1780,7 +1780,7 @@ msgstr "گوناگون" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "خطای هویت" +msgstr "عدم تطبیق هویت" msgctxt "MainWindow" msgid "done"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Jan '12

25 Jan '12

commit e0cce193ff71e441325258c3e939404145d1569e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 25 22:15:16 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index f982cca..07b41b7 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-25 11:54+0000\n" +"PO-Revision-Date: 2012-01-25 22:15+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1568,7 +1568,7 @@ msgstr "خطا در بازكردن فايل راهنما:" msgctxt "LicenseDialog" msgid "License Information" -msgstr "مجوز اطلاعات" +msgstr "اطلاعات مجوز" msgctxt "LicenseDialog" msgid "License" @@ -1576,7 +1576,7 @@ msgstr "مجوز" msgctxt "LicenseDialog" msgid "Credits" -msgstr "نوشته ها" +msgstr "اعتبارات" msgctxt "LogEvent" msgid "Debug" @@ -3662,7 +3662,7 @@ msgstr "همه را اعمال کن" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "فقط موارد انتخابی را اعمال کن" msgctxt "TorrcDialog" msgid "Error connecting to Tor" @@ -3671,6 +3671,8 @@ msgstr "خطا در ارتباط با تور" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" msgstr "" +"محدوده انتخاب خالی است. لطفن مقداری از مت و یا \"همه را اعمال کن\" را انتخاب" +" کنید" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" @@ -3682,7 +3684,7 @@ msgstr "خطا" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "در هنگام باز کردن فایل torrc یک خطا رخ داد" msgctxt "UPNPControl" msgid "Success"

1 0

[stem/master] Dropping Config.sync() in favor of config_dict()
by atagar＠torproject.org 25 Jan '12

25 Jan '12

commit 030579292593a9e8262edfc713e1d86b379dabf5 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 25 08:48:48 2012 -0800 Dropping Config.sync() in favor of config_dict() The Config class' sync method was a step in the right direction, but the name was confusing and the usage was suboptimal. In the vast majority of cases the caller simply wants a dictionary that stays in sync with the configuration. The config_dict() function is essentially the same as sync but with more succinct calls. --- run_tests.py | 6 ++-- stem/util/conf.py | 70 ++++++++++++++++++++++++++------------------- test/output.py | 6 +-- test/runner.py | 6 +-- test/unit/util/conf.py | 74 ++++++++++++++++++++++++------------------------ 5 files changed, 85 insertions(+), 77 deletions(-) diff --git a/run_tests.py b/run_tests.py index 6972e16..d4d2fd6 100755 --- a/run_tests.py +++ b/run_tests.py @@ -29,6 +29,7 @@ import test.integ.util.conf import test.integ.util.system import test.integ.version +import stem.util.conf import stem.util.enum import stem.util.log as log import stem.util.term as term @@ -37,7 +38,7 @@ OPT = "uic:l:t:h" OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "log=", "tor=", "no-color", "help"] DIVIDER = "=" * 70 -CONFIG = { +CONFIG = stem.util.conf.config_dict("test", { "argument.unit": False, "argument.integ": False, "argument.log": None, @@ -48,7 +49,7 @@ CONFIG = { "target.description": {}, "target.prereq": {}, "target.torrc": {}, -} +}) Target = stem.util.enum.Enum(*[(v, v) for v in ( "ONLINE", @@ -183,7 +184,6 @@ if __name__ == '__main__': # loads and validates our various configurations test_config = stem.util.conf.get_config("test") - test_config.sync(CONFIG) settings_path = os.path.join(test.runner.STEM_BASE, "test", "settings.cfg") test_config.load(settings_path) diff --git a/stem/util/conf.py b/stem/util/conf.py index 9250053..fe8ab68 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -19,6 +19,26 @@ a '|' prefix. For instance... |exclaiming about the wonders |and awe that is pepperjack! +The Config class acts as a central store for configuration values. Users of +this store have their own dictionaries of config key/value pairs that provide +three things... + + 1. Default values for the configuration keys in case they're either undefined + or of the wrong type. + 2. Types that we should attempt to cast the configuration values to. + 3. An easily accessable container for getting the config values. + +There are many ways of using the Config class but the most common ones are... + +- Call config_dict to get a dictionary that's always synced with with a Config. + +- Make a dictionary and call synchronize() to bring it into sync with the + Config. This does not keep it in sync as the Config changes. See the Config + class' pydocs for an example. + +- Just call the Config's get() or get_value() methods directly. + +config_dict - provides a dictionary that's kept synchronized with a config get_config - Singleton for getting configurations Config - Custom configuration. |- load - reads a configuration file @@ -27,7 +47,6 @@ Config - Custom configuration. |- synchronize - replaces mappings in a dictionary with the config's values |- add_listener - notifies the given listener when an update occures |- clear_listeners - removes any attached listeners - |- sync - keeps a dictionary synchronized with our config |- keys - provides keys in the loaded configuration |- set - sets the given key/value pair |- unused_keys - provides keys that have never been requested @@ -59,14 +78,27 @@ class SyncListener: self.config_dict[key] = new_value -# TODO: methods that will be needed if we want to allow for runtime -# customization... -# -# Config.set(key, value) - accepts any type that the get() method does, -# updating our contents with the string conversion -# -# Config.save(path) - writes our current configurations, ideally merging them -# with the file that exists there so commenting and such are preserved +def config_dict(handle, conf_mappings, handler = None): + """ + Makes a dictionary that stays synchronized with a configuration. The process + for staying in sync is similar to the Config class' synchronize() method, + only changing the dictionary's values if we're able to cast to the same type. + + If an handler is provided then this is called just prior to assigning new + values to the config_dict. The handler function is expected to accept the + (key, value) for the new values and return what we should actually insert + into the dictionary. If this returns None then the value is updated as + normal. + + Arguments: + handle (str) - unique identifier for a config instance + conf_mappings (dict) - config key/value mappings used as our defaults + handler (functor) - function referred to prior to assigning values + """ + + selected_config = get_config(handle) + selected_config.add_listener(SyncListener(conf_mappings, handler).update) + return conf_mappings def get_config(handle): """ @@ -312,26 +344,6 @@ class Config(): self._listeners = [] - def sync(self, config_dict, interceptor = None): - """ - Synchronizes a dictionary with our current configuration (like the - 'synchronize' method), and registers it to be updated whenever our - configuration changes. - - If an interceptor is provided then this is called just prior to assigning - new values to the config_dict. The interceptor function is expected to - accept the (key, value) for the new values and return what we should - actually insert into the dictionary. If this returns None then the value is - updated as normal. - - Arguments: - config_dict (dict) - dictionary to keep synchronized with our - configuration - interceptor (functor) - function referred to prior to assigning values - """ - - self.add_listener(SyncListener(config_dict, interceptor).update) - def keys(self): """ Provides all keys in the currently loaded configuration. diff --git a/test/output.py b/test/output.py index 76156b9..89a6cc0 100644 --- a/test/output.py +++ b/test/output.py @@ -11,11 +11,9 @@ import stem.util.conf import stem.util.enum import stem.util.term as term -CONFIG = { +CONFIG = stem.util.conf.config_dict("test", { "argument.no_color": False, -} - -stem.util.conf.get_config("test").sync(CONFIG) +}) DIVIDER = "=" * 70 HEADER_ATTR = (term.Color.CYAN, term.Attr.BOLD) diff --git a/test/runner.py b/test/runner.py index 405f96c..d3c6143 100644 --- a/test/runner.py +++ b/test/runner.py @@ -41,14 +41,12 @@ import stem.util.enum import stem.util.term as term import test.output -CONFIG = { +CONFIG = stem.util.conf.config_dict("test", { "integ.test_directory": "./test/data", "integ.log": "./test/data/log", "test.target.online": False, "test.target.relative_data_dir": False, -} - -stem.util.conf.get_config("test").sync(CONFIG) +}) STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD) SUBSTATUS_ATTR = (term.Color.BLUE, ) diff --git a/test/unit/util/conf.py b/test/unit/util/conf.py index 7df0402..0a31381 100644 --- a/test/unit/util/conf.py +++ b/test/unit/util/conf.py @@ -16,6 +16,43 @@ class TestConf(unittest.TestCase): test_config.clear() test_config.clear_listeners() + def test_config_dict(self): + """ + Tests the config_dict function. + """ + + my_config = { + "bool_value": False, + "int_value": 5, + "str_value": "hello", + "list_value": [], + } + + test_config = stem.util.conf.get_config("unit_testing") + + # checks that sync causes existing contents to be applied + test_config.set("bool_value", "true") + my_config = stem.util.conf.config_dict("unit_testing", my_config) + self.assertEquals(True, my_config["bool_value"]) + + # check a basic synchronize + test_config.set("str_value", "me") + self.assertEquals("me", my_config["str_value"]) + + # synchronize with a type mismatch, should keep the old value + test_config.set("int_value", "7a") + self.assertEquals(5, my_config["int_value"]) + + # changes for a collection + test_config.set("list_value", "a", False) + self.assertEquals(["a"], my_config["list_value"]) + + test_config.set("list_value", "b", False) + self.assertEquals(["a", "b"], my_config["list_value"]) + + test_config.set("list_value", "c", False) + self.assertEquals(["a", "b", "c"], my_config["list_value"]) + def test_clear(self): """ Tests the clear method. @@ -113,43 +150,6 @@ class TestConf(unittest.TestCase): test_config.set("foo", "bar") self.assertEquals(["hello"], listener_received_keys) - def test_sync(self): - """ - Tests the sync method. - """ - - my_config = { - "bool_value": False, - "int_value": 5, - "str_value": "hello", - "list_value": [], - } - - test_config = stem.util.conf.get_config("unit_testing") - - # checks that sync causes existing contents to be applied - test_config.set("bool_value", "true") - test_config.sync(my_config) - self.assertEquals(True, my_config["bool_value"]) - - # check a basic synchronize - test_config.set("str_value", "me") - self.assertEquals("me", my_config["str_value"]) - - # synchronize with a type mismatch, should keep the old value - test_config.set("int_value", "7a") - self.assertEquals(5, my_config["int_value"]) - - # changes for a collection - test_config.set("list_value", "a", False) - self.assertEquals(["a"], my_config["list_value"]) - - test_config.set("list_value", "b", False) - self.assertEquals(["a", "b"], my_config["list_value"]) - - test_config.set("list_value", "c", False) - self.assertEquals(["a", "b", "c"], my_config["list_value"]) - def test_unused_keys(self): """ Tests the unused_keys method.

1 0

[stem/master] Integ testing for multi-line configs
by atagar＠torproject.org 25 Jan '12

25 Jan '12

commit 2ae0452fb59ef5781e0803919b02cc0f3fa5212a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 24 09:47:51 2012 -0800 Integ testing for multi-line configs --- stem/util/conf.py | 5 +++++ test/integ/util/conf.py | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 67bd253..63843e5 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -217,6 +217,11 @@ class Config(): self._path = path self._contents_lock.release() + # TODO: pending improvements... + # - missing pydocs + # - integ testing + # - does not yet handle multi-line entries + # - should have an optional path argument def save(self): self._contents_lock.acquire() diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py index 0b4cbc8..6ac37c3 100644 --- a/test/integ/util/conf.py +++ b/test/integ/util/conf.py @@ -21,12 +21,36 @@ startup.run export PATH=$PATH:~/bin startup.run alias l=ls """ % CONF_HEADER +MULTILINE_CONF = """%s +multiline.entry.simple +|la de da +|and a ho hum + +multiline.entry.leading_whitespace + |la de da + |and a ho hum + +multiline.entry.empty + +multiline.entry.squashed_top +|la de da +|and a ho hum +multiline.entry.squashed_bottom +|la de da +|and a ho hum +""" + class TestConf(unittest.TestCase): """ Tests the stem.util.conf contents. """ def tearDown(self): + # clears the config contents + test_config = stem.util.conf.get_config("integ_testing") + test_config.clear() + test_config.clear_listeners() + # cleans up test configurations we made if os.path.exists(CONF_PATH): os.remove(CONF_PATH) @@ -46,7 +70,7 @@ class TestConf(unittest.TestCase): "destination.port": 22, "startup.run": []} - user_config = stem.util.conf.get_config("integ-ssh_login") + user_config = stem.util.conf.get_config("integ_testing") user_config.load(CONF_PATH) user_config.update(ssh_config) @@ -55,6 +79,21 @@ class TestConf(unittest.TestCase): 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"]) + + def test_load_multiline(self): + """ + Tests the load method with multi-line configuration files. + """ + + test_conf_file = open(CONF_PATH, "w") + test_conf_file.write(MULTILINE_CONF) + test_conf_file.close() + + test_config = stem.util.conf.get_config("integ_testing") + test_config.load(CONF_PATH) + + for entry in ("simple", "leading_whitespace", "squashed_top", "squashed_bottom"): + self.assertEquals("la de da\nand a ho hum", test_config.get("multiline.entry.%s" % entry)) - user_config.clear() + self.assertEquals("", test_config.get("multiline.entry.empty"))

1 0

[stem/master] Renaming the Config update method to synchronize()
by atagar＠torproject.org 25 Jan '12

25 Jan '12

commit 9e3834d80b0ae10f8ab5076e00186ddd346b39f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 25 07:36:11 2012 -0800 Renaming the Config update method to synchronize() Calling this method 'update()' has confused a couple people. It changes a dictionary to match the key/values in our current configuration. Calling this synchronize() makes more sense though now I should change the sync() method - that's next. --- stem/util/conf.py | 13 +++++++------ test/integ/util/conf.py | 2 +- test/unit/util/conf.py | 18 +++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 63843e5..9250053 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -24,7 +24,7 @@ Config - Custom configuration. |- load - reads a configuration file |- save - writes the current configuration to a file |- clear - empties our loaded configuration contents - |- update - replaces mappings in a dictionary with the config's values + |- synchronize - replaces mappings in a dictionary with the config's values |- add_listener - notifies the given listener when an update occures |- clear_listeners - removes any attached listeners |- sync - keeps a dictionary synchronized with our config @@ -143,7 +143,7 @@ class Config(): # Information for what values fail to load and why are reported to # 'stem.util.log'. - user_config.update(ssh_config) + user_config.synchronize(ssh_config) """ def __init__(self): @@ -248,7 +248,7 @@ class Config(): self._requested_keys = set() self._contents_lock.release() - def update(self, conf_mappings, limits = None): + def synchronize(self, conf_mappings, limits = None): """ This takes a dictionary of 'config_key => default_value' mappings and changes the values to reflect our current configuration. This will leave @@ -314,8 +314,9 @@ class Config(): def sync(self, config_dict, interceptor = None): """ - Synchronizes a dictionary with our current configuration (like the 'update' - method), and registers it to be updated whenever our configuration changes. + Synchronizes a dictionary with our current configuration (like the + 'synchronize' method), and registers it to be updated whenever our + configuration changes. If an interceptor is provided then this is called just prior to assigning new values to the config_dict. The interceptor function is expected to @@ -344,7 +345,7 @@ class Config(): def unused_keys(self): """ Provides the configuration keys that have never been provided to a caller - via the get, get_value, or update methods. + via the get, get_value, or synchronize methods. Returns: set of configuration keys we've loaded but have never been requested diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py index 6ac37c3..e6dfedb 100644 --- a/test/integ/util/conf.py +++ b/test/integ/util/conf.py @@ -72,7 +72,7 @@ class TestConf(unittest.TestCase): user_config = stem.util.conf.get_config("integ_testing") user_config.load(CONF_PATH) - user_config.update(ssh_config) + user_config.synchronize(ssh_config) self.assertEquals("atagar", ssh_config["login.user"]) self.assertEquals("pepperjack_is_awesome!", ssh_config["login.password"]) diff --git a/test/unit/util/conf.py b/test/unit/util/conf.py index 3e59a7c..7df0402 100644 --- a/test/unit/util/conf.py +++ b/test/unit/util/conf.py @@ -35,9 +35,9 @@ class TestConf(unittest.TestCase): test_config.clear() self.assertEquals([], test_config.keys()) - def test_update(self): + def test_synchronize(self): """ - Tests the update method. + Tests the synchronize method. """ my_config = { @@ -57,17 +57,17 @@ class TestConf(unittest.TestCase): test_config.set("list_value", "c", False) test_config.set("map_value", "foo => bar") - test_config.update(my_config) + test_config.synchronize(my_config) self.assertEquals(True, my_config["bool_value"]) self.assertEquals(11, my_config["int_value"]) self.assertEquals("world", my_config["str_value"]) self.assertEquals(["a", "b", "c"], my_config["list_value"]) self.assertEquals({"foo": "bar"}, my_config["map_value"]) - def test_update_type_mismatch(self): + def test_synchronize_type_mismatch(self): """ - Tests the update method when the config file has missing entries or the - wrong types. + Tests the synchronize method when the config file has missing entries or + the wrong types. """ my_config = { @@ -83,7 +83,7 @@ class TestConf(unittest.TestCase): test_config.set("int_value", "11a") test_config.set("map_value", "foo bar") - test_config.update(my_config) + test_config.synchronize(my_config) self.assertEquals(False, my_config["bool_value"]) self.assertEquals(5, my_config["int_value"]) self.assertEquals("hello", my_config["str_value"]) @@ -132,11 +132,11 @@ class TestConf(unittest.TestCase): test_config.sync(my_config) self.assertEquals(True, my_config["bool_value"]) - # check a basic update + # check a basic synchronize test_config.set("str_value", "me") self.assertEquals("me", my_config["str_value"]) - # update with a type mismatch, should keep the old value + # synchronize with a type mismatch, should keep the old value test_config.set("int_value", "7a") self.assertEquals(5, my_config["int_value"])

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Jan '12

25 Jan '12

commit 287546d1bcc78140e9f20e1ad94db82637f97c20 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 25 12:15:23 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 386d43d..f982cca 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-25 11:41+0000\n" +"PO-Revision-Date: 2012-01-25 11:54+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1543,7 +1543,7 @@ msgid "" "anonymous." msgstr "" "ویدالیا می تواند پیوندی را که انتخاب کردید در مرورگر پیش فرض تان بازکند. اگر" -" مرورگرتان برای استفاده از تور پیکربندی نشده هویتتان در هنگام درخواست مخفی " +" مرورگرتان برای استفاده از تور پیکربندی نشده، هویتتان در هنگام درخواست مخفی " "نخواهد بود." msgctxt "HelpTextBrowser" @@ -1559,8 +1559,8 @@ msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." msgstr "" -"ویدالیا نتوانست پیوند انتخاب شده در مرورگر وب تان را بازکند. شما می توانید " -"نشانی وب را کپی کرده و آن را در مرورگرتان بچسبانید." +"ویدالیا نتوانست پیوند انتخاب شده را در مرورگر وب بازکند. شما می توانید نشانی" +" وب را کپی کرده و آن را در مرورگرتان بچسبانید." msgctxt "HelpTextBrowser" msgid "Error opening help file:" @@ -3654,11 +3654,11 @@ msgstr "" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "انتخاب همه" msgctxt "TorrcDialog" msgid "Apply all" -msgstr "" +msgstr "همه را اعمال کن" msgctxt "TorrcDialog" msgid "Apply selection only"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Jan '12

25 Jan '12

commit 6c9f3469f41354144a5154947738ac3fead589ee Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 25 11:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index af2d5b1..386d43d 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-25 08:57+0000\n" +"PO-Revision-Date: 2012-01-25 11:41+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1506,7 +1506,7 @@ msgstr "حساسیت به بزرگی و کوچکی حروف" msgctxt "HelpBrowser" msgid "Whole words only" -msgstr "حستجو برای کلمات کامل" +msgstr "جستجو برای کلمات کامل" msgctxt "HelpBrowser" msgid "Help Topics" @@ -1514,7 +1514,7 @@ msgstr "سرفصل‌های راهنما" msgctxt "HelpBrowser" msgid "Contents" -msgstr "فهرست مطالب" +msgstr "مطالب" msgctxt "HelpBrowser" msgid "Search" @@ -1530,7 +1530,7 @@ msgstr "اسناد پیدا شده" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "خطا در بارگذاري فهرست راهنما:" +msgstr "خطا در بارگذاری مطالب راهنما:" msgctxt "HelpTextBrowser" msgid "Opening External Link" @@ -1542,13 +1542,13 @@ msgid "" "browser is not currently configured to use Tor then the request will not be " "anonymous." msgstr "" -"ویدالیا می تواند پیوندی را که انتخاب کردید در مرور گر یش‌گزیده تان بازکند. " -"اگر مرورگرتان برای استفاده از تُر پیکربندی نشده درخواستتان بی نام نخواهد " -"بود." +"ویدالیا می تواند پیوندی را که انتخاب کردید در مرورگر پیش فرض تان بازکند. اگر" +" مرورگرتان برای استفاده از تور پیکربندی نشده هویتتان در هنگام درخواست مخفی " +"نخواهد بود." msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" -msgstr "آیا می خواهید ویدالیا پیوند در مرورگر وب تان را باز کند؟" +msgstr "آیا می خواهید ویدالیا پیوند را در مرورگر وب تان را باز کند؟" msgctxt "HelpTextBrowser" msgid "Unable to Open Link"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Jan '12

25 Jan '12

commit 172631799a0c2158ef1b80964f032ca840c87d7c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 25 09:45:19 2012 +0000 Update translations for vidalia_help --- pt/running.po | 57 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/pt/running.po b/pt/running.po index 51a49c6..27431a6 100644 --- a/pt/running.po +++ b/pt/running.po @@ -1,12 +1,13 @@ # # Translators: +# Zeca Gatilho <paulo.mosh(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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-25 09:42+0000\n" +"Last-Translator: Zeca Gatilho <paulo.mosh(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" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/running.html:16 msgid "Running Tor" -msgstr "" +msgstr "Executar o Tor" #. type: Content of: <html><body> #: en/running.html:20 @@ -26,31 +27,36 @@ msgid "" "Tor, as well as monitoring Tor's status and letting you know if it exits " "unexpectedly." msgstr "" +"O Vidalia pode ajudá-lo a controlar o processo do Tor deixando-o iniciar e " +"para o Tor, bem como monitorizar o estado do Tor e avisá-lo se parar " +"inesperadamente." #. type: Content of: <html><body> #: en/running.html:25 msgid "<a name=\"starting\"/>" -msgstr "" +msgstr "<a name=\"starting\"/>" #. type: Content of: <html><body><h3> #: en/running.html:26 msgid "Starting and Stopping Tor" -msgstr "" +msgstr "Iniciando e Parando o Tor" #. type: Content of: <html><body> #: en/running.html:28 msgid "To start Tor," -msgstr "" +msgstr "Para iniciar o Tor," #. type: Content of: <html><body><ol><li> #: en/running.html:30 msgid "Select Start from Vidalia's tray menu or press Ctrl+S" msgstr "" +"Selecione Iniciar no menu de bandeja do Vidalia\n" +"ou clique Ctrl+S" #. type: Content of: <html><body><ol> #: en/running.html:30 en/running.html:45 msgid "." -msgstr "" +msgstr "." #. type: Content of: <html><body><ol><li> #: en/running.html:32 @@ -58,6 +64,8 @@ msgid "" "Vidalia's tray icon will change from an onion with a red X to a green onion " "when Tor has started." msgstr "" +"O icone de bandeja do Vidalia mudará de um alho com uma cruz vermelha para " +"verde quando o Tor iniciar." #. type: Content of: <html><body> #: en/running.html:36 @@ -67,16 +75,21 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." msgstr "" +"Se o Vidalia não conseguir iniciar o Tor, será mostrada uma mensagem de erro" +" dizendo-lhe o que correu mal. Pode também consultar o <a " +"href=\"log.html\">histórico de mensagens</a> para verificar e o Tor deu mais" +" alguma informação sobre o que correu mal." #. type: Content of: <html><body> #: en/running.html:43 msgid "To stop Tor," -msgstr "" +msgstr "Para parar o Tor," #. type: Content of: <html><body><ol><li> #: en/running.html:45 msgid "Select Stop from Vidalia's tray menu or press Ctrl+T" msgstr "" +"Selecione Parar no menu de bandeja do Vidalia ou clique Ctrl+T" #. type: Content of: <html><body><ol><li> #: en/running.html:47 @@ -84,6 +97,8 @@ msgid "" "Vidalia's tray icon will change from a green onion to a gray onion with a " "red X when Tor has stopped." msgstr "" +"O icone de bandeja do Vidalia mudara de alho verde com uma cruz vermelha " +"quando o Tor parar." #. type: Content of: <html><body> #: en/running.html:51 @@ -93,16 +108,20 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." msgstr "" +"Se o Vidalia não conseguir parar o Tor, será mostrada uma mensagem de erro " +"dizendo o que correu mal. Pode também consultar o <a " +"href=\"log.html\">histórico de mensagens</a> para verificar e o Tor deu mais" +" alguma informação sobre o que correu mal." #. type: Content of: <html><body> #: en/running.html:57 msgid "<a name=\"monitoring\"/>" -msgstr "" +msgstr "<a name=\"monitoring\"/>" #. type: Content of: <html><body><h3> #: en/running.html:58 msgid "Monitoring Tor's Status" -msgstr "" +msgstr "Monitorizar o estado do Tor" #. type: Content of: <html><body> #: en/running.html:60 @@ -111,12 +130,16 @@ msgid "" "system tray or dock area. The following table shows the different states " "indicated by an icon in your system's notification area:" msgstr "" +"O Vidalia indica-lhe o estado do Tor mostrando-lhe um icone na bandeja de " +"sistema ou na barra de tarefas." #. type: Content of: <html><body><table><tr><td> #: en/running.html:69 msgid "" "Tor is stopped. Select Start from the Vidalia menu to start Tor." msgstr "" +"O Tor está parado. Selecione Iniciar do menu do Vidalia para iniciar " +"o Tor." #. type: Content of: <html><body><table><tr><td> #: en/running.html:76 @@ -124,6 +147,9 @@ msgid "" "Tor is starting up. You can check the <a href=\"log.html\">message log</a> " "for status information about Tor while it is starting." msgstr "" +"O Tor está a iniciar. Pode verificar o <a href=\"log.html\">histórico de " +"mensagens</a> para ver a informação do estado do Tor enquanto está a " +"iniciar." #. type: Content of: <html><body><table><tr><td> #: en/running.html:84 @@ -133,11 +159,15 @@ msgid "" "href=\"log.html\">message log</a> while it is running, if you want to see " "what Tor is doing." msgstr "" +"O Tor está a ser executado. Se quizer para o Tor, selecione Parar do " +"menu do Vidalia. O Tor enviará mensagens informativas para o <a " +"href=\"log.html\">histórico de mensagens</a> enquanto estiver a ser " +"executado, se quiser saber o que o Tor está a fazer." #. type: Content of: <html><body><table><tr><td> #: en/running.html:92 msgid "Tor is in the process of shutting down." -msgstr "" +msgstr "O Tor está no processo de finalização." #. type: Content of: <html><body> #: en/running.html:98 @@ -147,5 +177,10 @@ msgid "" "You can also check the <a href=\"log.html\">message log</a> for details " "about any problems Tor encountered before it exited." msgstr "" +"Se o Tor parar inesperadamente, o Vidalia mudará o seu icone para o alho " +"negro com uma cruz vermelha e mostrará uma mensagem de erro para o informar " +"do que correu mal. Pode também consultar o <a href=\"log.html\">histórico de" +" mensagens</a> para ver os detalhes dos problemas que ocorreram enquanto o " +"Tor parava."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Jan '12

25 Jan '12

commit ebd636a9939de4f24ff395f3d45b569fe2380751 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 25 09:15:26 2012 +0000 Update translations for vidalia_help --- pt/bridges.po | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/pt/bridges.po b/pt/bridges.po index 4906080..c9b073d 100644 --- a/pt/bridges.po +++ b/pt/bridges.po @@ -6,7 +6,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 16:58+0200\n" -"PO-Revision-Date: 2012-01-25 08:26+0000\n" +"PO-Revision-Date: 2012-01-25 09:13+0000\n" "Last-Translator: Zeca Gatilho <paulo.mosh(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -42,31 +42,40 @@ msgid "" "to all the known Tor relays, they probably won't be able to block all the " "bridges." msgstr "" +"Alguns Fornecedores de Serviços de Internet (ISPs) tentam impedir que os " +"utilizadores acedam à rede Tor bloqueando as conexões aos retransmissores " +"Tor conhecidos. Os retransmissores Ponte (ou pontes) são " +"retransmissores que ajudam esses utilizadores censurados a aceder à rede " +"Tor. Diferentemente dos outros retransmissores, as pontes não estão listadas" +" nos mesmos diretórios públicos como retransmissores normais. Como não " +"existe uma lista completa das pontes, mesmo que o ISP filtre as ligações a " +"todos os retransmissores Tor, provavelmente não conseguirá ser capaz de " +"bloquear todas as pontes. " #. type: Content of: <html><body> #: en/bridges.html:31 msgid "<a name=\"finding\"/>" -msgstr "" +msgstr "<a name=\"finding\"/>" #. type: Content of: <html><body><h3> #: en/bridges.html:32 msgid "How do I find a bridge relay?" -msgstr "" +msgstr "Como encontro um retransmissor ponte?" #. type: Content of: <html><body> #: en/bridges.html:34 msgid "There are two main ways to learn about a bridge address:" -msgstr "" +msgstr "Existem duas formas principais de encontrar os endereços das pontes:" #. type: Content of: <html><body><ol><li> #: en/bridges.html:36 msgid "Get some friends to run private bridges for you" -msgstr "" +msgstr "Pedir a alguns amigos para executarem pontes privadas por si" #. type: Content of: <html><body><ol><li> #: en/bridges.html:37 msgid "Use some of the public bridges" -msgstr "" +msgstr "Usar algumas das pontes públicas" #. type: Content of: <html><body> #: en/bridges.html:42 @@ -79,6 +88,14 @@ msgid "" "just passes data to and from the Tor network, so it shouldn't expose the " "operator to any abuse complaints." msgstr "" +"Para usar pontes privadas, peça aos seus amigos para executar o Vidalia e o " +"Tor numa área da Internet não censurada, e depois clique em Ajudar " +"utilizadores censurados na <a href=\"server.html\">página de " +"Configuração do Retransmissor</a> do Vidalia. Depois eles deverão enviar-lhe" +" em privado a linha do endereço da Ponte no fundo da página do " +"Retransmissor deles. Diferentemente de executar um retransmissor de saída, " +"executar uma ponte apenas passa dados para e da rede Tor, por isso não " +"deverá expor o operador a nenhumas queixas de abuso. " #. type: Content of: <html><body> #: en/bridges.html:52 @@ -92,6 +109,14 @@ msgid "" "attacker to learn lots of bridge addresses, you must send this request from " "a Gmail account." msgstr "" +"Pode encontrar endereços de pontes públicas visitando " +"https://bridges.torproject.org. As respostas que obtiver dessa página" +" mudará ao fim de alguns dias, por isso revisite periodicamente se precisar " +"mais endereços de pontes. Outra forma de encontrar endereços é enviar um " +"mail para bridges(a)torproject.org com a linha individual get " +"bridges no corpo. No entanto, para tornarmos mais difícil aos atacantes " +"descobrir muitos endereços das pontes, deverá enviar este pedido de uma " +"conta de mail do Gmail." #. type: Content of: <html><body> #: en/bridges.html:63 @@ -99,5 +124,7 @@ msgid "" "Configuring more than one bridge address will make your Tor connection more " "stable, in case some of the bridges become unreachable." msgstr "" +"Configurar mais de um endereço das pontes tornará a sua conexão ao Tor mais " +"estável, no caso de algumas pontes ficarem indisponíveis."

1 0