Bug 1506380 - Rename opcode.py to avoid conflict with builtin Python …

…module. r=arai Differential Revision: https://phabricator.services.mozilla.com/D11568 --HG-- rename : js/src/vm/opcode.py => js/src/vm/jsopcode.py extra : moz-landing-system : lando
dothq · Nov 12, 2018 · 97ccc8c · 97ccc8c
1 parent 69825a3
commit 97ccc8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/check_js_opcode.py b/config/check_js_opcode.py
@@ -26,10 +26,10 @@ def log_fail(text):
 
 def check_opcode():
     sys.path.insert(0, os.path.join(topsrcdir, 'js', 'src', 'vm'))
-    import opcode
+    import jsopcode
 
     try:
-        opcode.get_opcodes(topsrcdir)
+        jsopcode.get_opcodes(topsrcdir)
     except Exception as e:
         log_fail(e.args[0])
         return False

diff --git a/js/src/vm/opcode.py → js/src/vm/jsopcode.py b/js/src/vm/opcode.py → js/src/vm/jsopcode.py
diff --git a/js/src/vm/make_opcode_doc.py b/js/src/vm/make_opcode_doc.py
@@ -15,7 +15,7 @@
 
 import os
 sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)))
-import opcode
+import jsopcode
 
 from xml.sax.saxutils import escape
 
@@ -139,7 +139,7 @@ def print_doc(index):
     dir = sys.argv[1]
 
     try:
-        index, _ = opcode.get_opcodes(dir)
+        index, _ = jsopcode.get_opcodes(dir)
     except Exception as e:
         print("Error: {}".format(e.args[0]), file=sys.stderr)
         sys.exit(1)