Commits

Joe Amenta committed e9cce8f

Use preorder traversal to shorten up the code

Comments (0)

Files changed (1)

lib3to2/fixes/fix_bytes.py

 
 class FixBytes(fixer_base.BaseFix):
 
-    PATTERN = "STRING | power< name='bytes' [trailer< '(' (args=arglist | any*) ')' >] > | name='bytes'"
-
-    def match(self, node):
-        results = super().match(node)
-        if results and node.type == token.NAME and node.parent is not None:
-            if super().match(node.parent):
-                # Do not match a simple name if it is within a larger matching context
-                return False
-        return results
+    order = "pre"
+    
+    PATTERN = "STRING | power< 'bytes' [trailer< '(' (args=arglist | any*) ')' >] > | 'bytes'"
 
     def transform(self, node, results):
         name = results.get("name")
         arglist = results.get("args")
-        if name is not None:
-            assert name.value == "bytes"
-            name.value = "str"
-            name.changed()
+        if node.type == token.NAME:
+            return Name("str", prefix=node.prefix)
         elif node.type == token.STRING:
             if _literal_re.match(node.value):
                 new = node.clone()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.