Remove unused code from sql.py and style up some changes

vmuriart · vmuriart · commit 0bcb34cc1514 · 2016-06-14T03:28:18.000-07:00
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -338,16 +338,6 @@ def token_index(self, token, start=0):
         start = start if isinstance(start, int) else self.token_index(start)
         return start + self.tokens[start:].index(token)
 
-    def tokens_between(self, start, end, include_end=True):
-        """Return all tokens between (and including) start and end.
-
-        If *include_end* is ``False`` (default is ``True``) the end token
-        is excluded.
-        """
-        start_idx = self.token_index(start)
-        end_idx = include_end + self.token_index(end)
-        return self.tokens[start_idx:end_idx]
-
     def group_tokens_between(self, grp_cls, start, end, include_end=True,
                              extend=False):
         """Replace tokens by an instance of *grp_cls*."""
@@ -357,16 +347,20 @@ def group_tokens_between(self, grp_cls, start, end, include_end=True,
         else:
             start_idx = self.token_index(start)
 
-        end_idx = self.token_index(end) if not isinstance(end, int) else end
-        end_idx += include_end
+        end = end if isinstance(end, int) else self.token_index(end, start_idx)
+        end_idx = end + include_end
+
+        # will be needed later for new group_clauses
+        # while skip_ws and tokens and tokens[-1].is_whitespace():
+        #     tokens = tokens[:-1]
 
         if extend and isinstance(start, grp_cls):
             subtokens = self.tokens[start_idx + 1:end_idx]
 
             grp = start
             grp.tokens.extend(subtokens)
             del self.tokens[start_idx + 1:end_idx]
-            grp.value = start.__str__()
+            grp.value = text_type(start)
         else:
             subtokens = self.tokens[start_idx:end_idx]
             grp = grp_cls(subtokens)
@@ -378,31 +372,6 @@ def group_tokens_between(self, grp_cls, start, end, include_end=True,
 
         return grp
 
-    def group_tokens(self, grp_cls, tokens, skip_ws=False, extend=False):
-        """Replace tokens by an instance of *grp_cls*."""
-
-        while skip_ws and tokens and tokens[-1].is_whitespace():
-            tokens = tokens[:-1]
-
-        left = tokens[0]
-        idx = self.token_index(left)
-
-        if extend and isinstance(left, grp_cls):
-            grp = left
-            grp.tokens.extend(tokens[1:])
-        else:
-            grp = grp_cls(tokens)
-
-        for token in tokens:
-            token.parent = grp
-
-        # Improve performance. LOOP(list.remove()) is O(n**2) operation
-        self.tokens = [token for token in self.tokens if token not in tokens]
-
-        self.tokens.insert(idx, grp)
-        grp.parent = self
-        return grp
-
     def insert_before(self, where, token):
         """Inserts *token* before *where*."""
         token.parent = self
