Simplify comparisons

sebastinas · sebastinas · commit 3e8711c1290a · 2021-05-21T21:42:44.000+02:00
diff --git a/bpython/line.py b/bpython/line.py
@@ -22,7 +22,7 @@ def current_word(cursor_offset: int, line: str) -> Optional[LinePart]:
     end = pos
     word = None
     for m in current_word_re.finditer(line):
-        if m.start(1) < pos and m.end(1) >= pos:
+        if m.start(1) < pos <= m.end(1):
             start = m.start(1)
             end = m.end(1)
             word = m.group(1)
@@ -37,7 +37,7 @@ def current_word(cursor_offset: int, line: str) -> Optional[LinePart]:
 def current_dict_key(cursor_offset: int, line: str) -> Optional[LinePart]:
     """If in dictionary completion, return the current key"""
     for m in current_dict_key_re.finditer(line):
-        if m.start(1) <= cursor_offset and m.end(1) >= cursor_offset:
+        if m.start(1) <= cursor_offset <= m.end(1):
             return LinePart(m.start(1), m.end(1), m.group(1))
     return None
 
@@ -48,7 +48,7 @@ def current_dict_key(cursor_offset: int, line: str) -> Optional[LinePart]:
 def current_dict(cursor_offset: int, line: str) -> Optional[LinePart]:
     """If in dictionary completion, return the dict that should be used"""
     for m in current_dict_re.finditer(line):
-        if m.start(2) <= cursor_offset and m.end(2) >= cursor_offset:
+        if m.start(2) <= cursor_offset <= m.end(2):
             return LinePart(m.start(1), m.end(1), m.group(1))
     return None
 
@@ -67,7 +67,7 @@ def current_string(cursor_offset: int, line: str) -> Optional[LinePart]:
     string is a string based on previous lines in the buffer."""
     for m in current_string_re.finditer(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 <= m.end(i):
             return LinePart(m.start(i), m.end(i), m.group(i))
     return None
 
@@ -108,10 +108,7 @@ def current_object_attribute(
     matches = current_object_attribute_re.finditer(word)
     next(matches)
     for m in matches:
-        if (
-            m.start(1) + start <= cursor_offset
-            and m.end(1) + start >= cursor_offset
-        ):
+        if m.start(1) + start <= cursor_offset <= m.end(1) + start:
             return LinePart(m.start(1) + start, m.end(1) + start, m.group(1))
     return None
 
@@ -131,8 +128,8 @@ def current_from_import_from(
     """
     # TODO allow for as's
     for m in current_from_import_from_re.finditer(line):
-        if (m.start(1) < cursor_offset and m.end(1) >= cursor_offset) or (
-            m.start(2) < cursor_offset and m.end(2) >= cursor_offset
+        if (m.start(1) < cursor_offset <= m.end(1)) or (
+            m.start(2) < cursor_offset <= m.end(2)
         ):
             return LinePart(m.start(1), m.end(1), m.group(1))
     return None
@@ -162,7 +159,7 @@ def current_from_import_import(
     ):
         start = baseline.end() + m.start(1)
         end = baseline.end() + m.end(1)
-        if start < cursor_offset and end >= cursor_offset:
+        if start < cursor_offset <= end:
             return LinePart(start, end, m.group(1))
     return None
 
@@ -185,7 +182,7 @@ def current_import(cursor_offset: int, line: str) -> Optional[LinePart]:
     ):
         start = baseline.end() + m.start(1)
         end = baseline.end() + m.end(1)
-        if start < cursor_offset and end >= cursor_offset:
+        if start < cursor_offset <= end:
             return LinePart(start, end, m.group(1))
     return None
 
@@ -198,7 +195,7 @@ def current_method_definition_name(
 ) -> Optional[LinePart]:
     """The name of a method being defined"""
     for m in current_method_definition_name_re.finditer(line):
-        if m.start(1) <= cursor_offset and m.end(1) >= cursor_offset:
+        if m.start(1) <= cursor_offset <= m.end(1):
             return LinePart(m.start(1), m.end(1), m.group(1))
     return None
 
@@ -209,7 +206,7 @@ def current_method_definition_name(
 def current_single_word(cursor_offset: int, line: str) -> Optional[LinePart]:
     """the un-dotted word just before or under the cursor"""
     for m in current_single_word_re.finditer(line):
-        if m.start(1) <= cursor_offset and m.end(1) >= cursor_offset:
+        if m.start(1) <= cursor_offset <= m.end(1):
             return LinePart(m.start(1), m.end(1), m.group(1))
     return None
 
@@ -238,6 +235,6 @@ def current_expression_attribute(
     """If after a dot, the attribute being completed"""
     # TODO replace with more general current_expression_attribute
     for m in current_expression_attribute_re.finditer(line):
-        if m.start(1) <= cursor_offset and m.end(1) >= cursor_offset:
+        if m.start(1) <= cursor_offset <= m.end(1):
             return LinePart(m.start(1), m.end(1), m.group(1))
     return None
