Fix more locations in code that want to split a thing into two based on first equals sign, but ended up splitting to possibly more than two parts. #5467

Author: juj

tests/test_core.py

@@ -7439,7 +7439,7 @@ def setUp(self):
         Building.COMPILER_TEST_OPTS.append(arg) # so bitcode is optimized too, this is for cpp to ll
       else:
         try:
-          key, value = arg.split('=')
+          key, value = arg.split('=', 1)
           Settings[key] = value # forward  -s K=V
         except:
           pass

tools/asm_module.py

@@ -52,7 +52,7 @@ def __init__(self, filename):
         for part in imp.split(','):
           assert part.count('(') == part.count(')') # we must not break ',' in func(x, y)!
           assert part.count('=') == 1
-          key, value = part.split('=')
+          key, value = part.split('=', 1)
           self.imports[key.strip()] = value.strip()
 
     #print >> sys.stderr, 'imports', self.imports
@@ -266,7 +266,7 @@ def parse_tables(self, js):
     for part in parts:
       if '=' not in part: continue
       part = part.split('var ')[1]
-      name, data = part.split('=')
+      name, data = part.split('=', 1)
       tables[name.strip()] = data.strip()
     return tables
 

tools/ctor_evaller.py

@@ -82,7 +82,7 @@ def add_func(asm, func):
     part = part[4:] # skip 'var '
     bits = map(lambda x: x.strip(), part.split(','))
     for bit in bits:
-      name, value = map(lambda x: x.strip(), bit.split('='))
+      name, value = map(lambda x: x.strip(), bit.split('=', 1))
       if value in ['0', '+0', '0.0'] or name in [
         'STACKTOP', 'STACK_MAX', 'DYNAMICTOP_PTR',
         'HEAP8', 'HEAP16', 'HEAP32',

tools/emmaken.py

@@ -191,7 +191,7 @@ def path_from_root(*pathelems):
         if arg == '-o':
           found_o = True
           continue
-        prefix = arg.split('=')[0]
+        prefix = arg.split('=', 1)[0]
         if prefix in ALLOWED_LINK_ARGS:
           newargs.append(arg)
         if arg in TWO_PART_DISALLOWED_LINK_ARGS:

tools/emprofile.py

@@ -10,7 +10,7 @@
 OUTFILE = 'toolchain_profiler.results_' + time.strftime('%Y%m%d_%H%M')
 for arg in sys.argv:
   if arg.startswith('--outfile='):
-    OUTFILE = arg.split('=')[1].strip().replace('.html', '')
+    OUTFILE = arg.split('=', 1)[1].strip().replace('.html', '')
 
 # Deletes all previously captured log files to make room for a new clean run.
 def delete_profiler_logs():

tools/emterpretify.py

@@ -30,7 +30,7 @@
 def handle_arg(arg):
   global ZERO, ASYNC, ASSERTIONS, PROFILING, FROUND, ADVISE, MEMORY_SAFE, OUTPUT_FILE
   if '=' in arg:
-    l, r = arg.split('=')
+    l, r = arg.split('=', 1)
     if l == 'ZERO': ZERO = int(r)
     elif l == 'ASYNC': ASYNC = int(r)
     elif l == 'ASSERTIONS': ASSERTIONS = int(r)

tools/file_packager.py

@@ -130,7 +130,7 @@
     use_preload_cache = True
     leading = ''
   elif arg.startswith('--indexedDB-name'):
-    indexeddb_name = arg.split('=')[1] if '=' in arg else None
+    indexeddb_name = arg.split('=', 1)[1] if '=' in arg else None
     leading = ''
   elif arg == '--no-heap-copy':
     no_heap_copy = False
@@ -145,7 +145,7 @@
     use_preload_plugins = True
     leading = ''
   elif arg.startswith('--js-output'):
-    jsoutput = arg.split('=')[1] if '=' in arg else None
+    jsoutput = arg.split('=', 1)[1] if '=' in arg else None
     leading = ''
   elif arg.startswith('--no-closure'):
     no_closure = True
@@ -156,10 +156,10 @@
     except Exception, e:
       print >> sys.stderr, 'could not import CRUNCH (make sure it is defined properly in ' + shared.hint_config_file_location() + ')'
       raise e
-    crunch = arg.split('=')[1] if '=' in arg else '128'
+    crunch = arg.split('=', 1)[1] if '=' in arg else '128'
     leading = ''
   elif arg.startswith('--plugin'):
-    plugin = open(arg.split('=')[1], 'r').read()
+    plugin = open(arg.split('=', 1)[1], 'r').read()
     eval(plugin) # should append itself to plugins
     leading = ''
   elif leading == 'preload' or leading == 'embed':

tools/js_optimizer.py

@@ -371,7 +371,7 @@ def process(line):
       minifier = Minifier(js, js_engine)
       def check_symbol_mapping(p):
         if p.startswith('symbolMap='):
-          minifier.symbols_file = p.split('=')[1]
+          minifier.symbols_file = p.split('=', 1)[1]
           return False
         if p == 'profilingFuncs':
           minifier.profiling_funcs = True

tools/system_libs.py

@@ -569,7 +569,7 @@ def retrieve():
       # note that tag **must** be the tag in sdl.py, it is where we store to (not where we load from, we just load the local dir)
       local_ports = os.environ.get('EMCC_LOCAL_PORTS')
       if local_ports:
-        local_ports = map(lambda pair: pair.split('='), local_ports.split(','))
+        local_ports = map(lambda pair: pair.split('=', 1), local_ports.split(','))
         for local in local_ports:
           if name == local[0]:
             path, subdir = local[1].split('|')