Merge branch 'fix-497'

thomasballinger · thomasballinger · commit 979a67b47f3b · 2015-03-02T13:41:00.000-05:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1070,6 +1070,8 @@ def edit_config(self):
                 try:
                     default_config = pkgutil.get_data('bpython',
                                                       'sample-config')
+                    if py3:  # py3 files need unicode
+                        default_config = default_config.decode('ascii')
                     bpython_dir, script_name = os.path.split(__file__)
                     containing_dir = os.path.dirname(
                         os.path.abspath(self.config.config_path))
diff --git a/bpython/sample-config b/bpython/sample-config
@@ -45,7 +45,7 @@
 # save_append_py = False
 
 # The name of a helper executable that should perform pastebin upload on
-# bpython’s behalf. If unset, bpython uploads pastes to bpaste.net. (default: )
+# bpython's behalf. If unset, bpython uploads pastes to bpaste.net. (default: )
 #pastebin_helper = gist.py
 
 # How long an undo must be expected to take before prompting for how
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -1,7 +1,9 @@
 import collections
 from itertools import islice
 import os
+import shutil
 import socket
+import tempfile
 from six.moves import range
 
 try:
@@ -11,7 +13,7 @@
 
 from bpython._py3compat import py3
 from bpython import config, repl, cli, autocomplete
-from bpython.test import MagicIterMock, mock
+from bpython.test import MagicIterMock, mock, FixLanguageTestCase as TestCase
 
 
 def setup_config(conf):
@@ -252,6 +254,25 @@ def test_current_line(self):
 # TODO add tests for various failures without using current function
 
 
+class TestEditConfig(TestCase):
+    def setUp(self):
+        self.repl = FakeRepl()
+        self.repl.interact.confirm = lambda msg: True
+        self.repl.interact.notify = lambda msg: None
+        self.repl.config.editor = 'true'
+
+    def test_create_config(self):
+        tmp_dir = tempfile.mkdtemp()
+        try:
+            config_path = os.path.join(tmp_dir, 'newdir', 'config')
+            self.repl.config.config_path = config_path
+            self.repl.edit_config()
+            self.assertTrue(os.path.exists(config_path))
+        finally:
+            shutil.rmtree(tmp_dir)
+            self.assertFalse(os.path.exists(config_path))
+
+
 class TestRepl(unittest.TestCase):
 
     def set_input_line(self, line):
