bpython
diff --git a/‎bpython/repl.py‎
Lines changed: 8 additions & 6 deletions b/‎bpython/repl.py‎
Lines changed: 8 additions & 6 deletions
diff --git a/‎bpython/test/test_args.py‎
Lines changed: 17 additions & 1 deletion b/‎bpython/test/test_args.py‎
Lines changed: 17 additions & 1 deletion
@@ -104,21 +104,23 @@ def reset_running_time(self):
         self.running_time = 0
 
     def runsource(self, source, filename=None, symbol='single',
-                  encode=True):
+                  encode='auto'):
         """Execute Python code.
 
         source, filename and symbol are passed on to
-        code.InteractiveInterpreter.runsource. If encode is True, the source
-        will be encoded. On Python 3.X, encode will be ignored.
+        code.InteractiveInterpreter.runsource. If encode is True,
+        an encoding comment will be added to the source.
+        On Python 3.X, encode will be ignored.
 
-        encode doesn't encode the source, it just adds an encoding comment
-        that specifies the encoding of the source.
         encode should only be used for interactive interpreter input,
-        files should always have an encoding comment or be ASCII.
+        files should always already have an encoding comment or be ASCII.
+        By default an encoding line will be added if no filename is given.
 
         In Python 3, source must be a unicode string
         In Python 2, source may be latin-1 bytestring or unicode string,
         following the interface of code.InteractiveInterpreter"""
+        if encode == 'auto':
+            encode = filename is None
         if encode and not py3:
             if isinstance(source, str):
                 # encoding only makes sense for bytestrings
 
@@ -36,7 +36,6 @@ def test_exec_dunder_file(self):
 
             self.assertEquals(stderr.strip(), f.name)
 
-
     def test_exec_nonascii_file(self):
         with tempfile.NamedTemporaryFile(mode="w") as f:
             f.write(dedent('''\
@@ -52,6 +51,23 @@ def test_exec_nonascii_file(self):
             except subprocess.CalledProcessError:
                 self.fail('Error running module with nonascii characters')
 
+    def test_exec_nonascii_file_linenums(self):
+        with tempfile.NamedTemporaryFile(mode="w") as f:
+            f.write(dedent("""\
+                #!/usr/bin/env python2
+                # coding: utf-8
+                1/0
+                """))
+            f.flush()
+            p = subprocess.Popen(
+                [sys.executable, "-m", "bpython.curtsies",
+                    f.name],
+                stderr=subprocess.PIPE,
+                universal_newlines=True)
+            (_, stderr) = p.communicate()
+
+            self.assertIn('line 3', stderr)
+
 
 class TestParse(TestCase):