bpython
diff --git a/‎bpython/line.py‎
Lines changed: 3 additions & 3 deletions b/‎bpython/line.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎bpython/test/test_keys.py‎
100755100644 b/‎bpython/test/test_keys.py‎
100755100644
diff --git a/‎bpython/test/test_line_properties.py‎
100755100644 b/‎bpython/test/test_line_properties.py‎
100755100644
diff --git a/‎bpython/test/test_repl.py‎
Lines changed: 6 additions & 1 deletion b/‎bpython/test/test_repl.py‎
Lines changed: 6 additions & 1 deletion
@@ -38,13 +38,13 @@ def current_dict(cursor_offset, line):
     return None
 
 def current_string(cursor_offset, line):
-    """If inside a string, return the string (excluding quotes)
+    """If inside a string of nonzero length, return the string (excluding quotes)
 
     Weaker than bpython.Repl's current_string, because that checks that a string is a string
     based on previous lines in the buffer"""
-    for m in re.finditer('''(?P<open>(?:""")|"|(?:''\')|')(?:((?P<closed>.*?)(?P=open))|(?P<unclosed>.*))''', line):
+    for m in re.finditer('''(?P<open>(?:""")|"|(?:''\')|')(?:((?P<closed>.+?)(?P=open))|(?P<unclosed>.+))''', line):
         i = 3 if m.group(3) else 4
-        if m.start(i) < cursor_offset and m.end(i) >= cursor_offset:
+        if m.start(i) <= cursor_offset and m.end(i) >= cursor_offset:
             return m.start(i), m.end(i), m.group(i)
     return None
 
 
@@ -8,6 +8,8 @@
     def skip(f):
         return lambda self: None
 
+py3 = (sys.version_info[0] == 3)
+
 from bpython import config, repl, cli, autocomplete
 
 def setup_config(conf):
@@ -399,7 +401,10 @@ def setUp(self):
     # 3 Types of tab complete
     def test_simple_tab_complete(self):
         self.repl.matches_iter = MagicMock()
-        self.repl.matches_iter.__nonzero__.return_value = False
+        if py3:
+            self.repl.matches_iter.__bool__.return_value = False
+        else:
+            self.repl.matches_iter.__nonzero__.return_value = False
         self.repl.complete = Mock()
         self.repl.print_line = Mock()
         self.repl.matches_iter.is_cseq.return_value = False