tMerge pull request #1246 from kyuupichan/bug_fix - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit 7becb28ec8a550f8749b0b1e80233c12b2498644
 (DIR) parent 2b50e4064c7a11ecbec08cd05d80180ac62ef705
 (HTM) Author: ThomasV <electrumdev@gmail.com>
       Date:   Mon, 25 May 2015 13:28:42 +0200
       
       Merge pull request #1246 from kyuupichan/bug_fix
       
       e20dfc unintentionally inverted portable condition
       Diffstat:
         M lib/simple_config.py                |       4 ++--
         M lib/tests/test_simple_config.py     |       7 +++----
       
       2 files changed, 5 insertions(+), 6 deletions(-)
       ---
 (DIR) diff --git a/lib/simple_config.py b/lib/simple_config.py
       t@@ -56,9 +56,9 @@ class SimpleConfig(object):
        
                # Portable wallets don't use a system config
                if self.cmdline_options.get('portable', False):
       -            self.system_config = read_system_config_function()
       -        else:
                    self.system_config = {}
       +        else:
       +            self.system_config = read_system_config_function()
        
                # Set self.path and read the user config
                self.user_config = {}  # for self.get in electrum_path()
 (DIR) diff --git a/lib/tests/test_simple_config.py b/lib/tests/test_simple_config.py
       t@@ -81,15 +81,14 @@ class Test_SimpleConfig(unittest.TestCase):
            def test_simple_config_system_config_ignored_if_portable(self):
                """If electrum is started with the "portable" flag, system
                configuration is completely ignored."""
       -        another_path = tempfile.mkdtemp()
       -        fake_read_system = lambda : {"electrum_path": self.electrum_dir}
       -        fake_read_user = lambda _: {"electrum_path": another_path}
       +        fake_read_system = lambda : {"some_key": "some_value"}
       +        fake_read_user = lambda _: {}
                read_user_dir = lambda : self.user_dir
                config = SimpleConfig(options={"portable": True},
                                      read_system_config_function=fake_read_system,
                                      read_user_config_function=fake_read_user,
                                      read_user_dir_function=read_user_dir)
       -        self.assertEqual(another_path, config.get("electrum_path"))
       +        self.assertEqual(config.get("some_key"), None)
        
            def test_simple_config_user_config_is_used_if_others_arent_specified(self):
                """If no system-wide configuration and no command-line options are