Drop python 2 built-ins

1st1 · 1st1 · commit 300fe145e23c · 2015-10-12T23:42:30.000-04:00
diff --git a/MagicPython.YAML-tmLanguage b/MagicPython.YAML-tmLanguage
@@ -865,25 +865,24 @@ repository:
     match: |
       (?x)
         (?<!\.)\b(
-          __import__ | abs | all | any | apply | callable | chr | cmp | coerce
-          | compile | copyright | credits | delattr | dir | divmod | enumerate
-          | eval | exec | execfile | exit | filter | format | getattr
-          | globals | hasattr | hash | help | id | input | intern
+          __import__ | abs | all | any | apply | callable | chr
+          | compile | copyright | credits | delattr | dir | divmod
+          | enumerate | eval | exec | exit | filter | format | getattr
+          | globals | hasattr | hash | help | id | input
           | isinstance | issubclass | iter | len | license | locals | map
           | max | memoryview | min | next | open | ord | pow | print
-          | quit | range | raw_input | reduce | reload | repr | round
-          | setattr | sorted | sum | unichr | vars | zip
+          | quit | range | reload | repr | round
+          | setattr | sorted | sum | vars | zip
         )\b
   builtin-types:
     name: support.type.python
     match: |
       (?x)
         (?<!\.)\b(
-          ascii | basestring | bin | bool | buffer | bytearray | bytes
-          | classmethod | complex | dict | file | float | frozenset
-          | hex | int | list | long | object | oct | property | reversed
+          ascii | bin | bool | bytearray | bytes
+          | classmethod | complex | dict | float | frozenset
+          | hex | int | list | object | oct | property | reversed
           | set | slice | staticmethod | str | super | tuple | type
-          | unicode | xrange
         )\b
 
   magic-function-names:
diff --git a/MagicPython.tmLanguage b/MagicPython.tmLanguage
@@ -165,14 +165,14 @@
 			<key>match</key>
 			<string>(?x)
   (?&lt;!\.)\b(
-    __import__ | abs | all | any | apply | callable | chr | cmp | coerce
-    | compile | copyright | credits | delattr | dir | divmod | enumerate
-    | eval | exec | execfile | exit | filter | format | getattr
-    | globals | hasattr | hash | help | id | input | intern
+    __import__ | abs | all | any | apply | callable | chr
+    | compile | copyright | credits | delattr | dir | divmod
+    | enumerate | eval | exec | exit | filter | format | getattr
+    | globals | hasattr | hash | help | id | input
     | isinstance | issubclass | iter | len | license | locals | map
     | max | memoryview | min | next | open | ord | pow | print
-    | quit | range | raw_input | reduce | reload | repr | round
-    | setattr | sorted | sum | unichr | vars | zip
+    | quit | range | reload | repr | round
+    | setattr | sorted | sum | vars | zip
   )\b
 </string>
 			<key>name</key>
@@ -201,11 +201,10 @@
 			<key>match</key>
 			<string>(?x)
   (?&lt;!\.)\b(
-    ascii | basestring | bin | bool | buffer | bytearray | bytes
-    | classmethod | complex | dict | file | float | frozenset
-    | hex | int | list | long | object | oct | property | reversed
+    ascii | bin | bool | bytearray | bytes
+    | classmethod | complex | dict | float | frozenset
+    | hex | int | list | object | oct | property | reversed
     | set | slice | staticmethod | str | super | tuple | type
-    | unicode | xrange
   )\b
 </string>
 			<key>name</key>
diff --git a/test/builtins/builtins2.py b/test/builtins/builtins2.py
@@ -1,4 +1,7 @@
 Error
+file reduce intern raw_input unicode cmp basestring
+
 
 
 Error         : source.python
+file reduce intern raw_input unicode cmp basestring : source.python
