Update config

* Fix tests
* Remove unused 'arch' option
* Fixes deprecation warnings

Author: boriel

api/config.py

@@ -63,13 +63,12 @@ def init():
     OPTIONS.add_option('arrayCheck', bool, False)
     OPTIONS.add_option('enableBreak', bool, False)
     OPTIONS.add_option('emitBackend', bool, False)
-    OPTIONS.add_option('arch', str, 'zx48k')
     OPTIONS.add_option('__DEFINES', dict, {})
     OPTIONS.add_option('explicit', bool, False)
     OPTIONS.add_option('Sinclair', bool, False)
     OPTIONS.add_option('strict', bool, False)  # True to force type checking
     OPTIONS.add_option('zxnext', bool, False)  # True to enable ZX Next ASM opcodes
-    OPTIONS.add_option('architecture', str)  # Architecture
+    OPTIONS.add_option('architecture', str, None)  # Architecture
 
 
 init()

ast_/tree.py

@@ -92,7 +92,7 @@ def children(self):
 
     @children.setter
     def children(self, value):
-        assert isinstance(value, collections.Iterable)
+        assert isinstance(value, collections.abc.Iterable)
         while len(self.children):
             self.children.pop()
 

libzxbc/zxbparser.py

@@ -222,7 +222,7 @@ def make_builtin(lineno, fname, operands, func=None, type_=None):
     assert isinstance(operands, Symbol) or isinstance(operands, tuple) or isinstance(operands, list)
     # TODO: In the future, builtin functions will be implemented in an external library, like POINT or ATTR
     __DEBUG__('Creating BUILTIN "{}"'.format(fname), 1)
-    if not isinstance(operands, collections.Iterable):
+    if not isinstance(operands, collections.abc.Iterable):
         operands = [operands]
     return symbols.BUILTIN.make_node(lineno, fname, func, type_, *operands)
 

tests/api/test_config.py

@@ -36,7 +36,7 @@ def test_init(self):
         self.assertEqual(config.OPTIONS.arrayCheck.value, False)
         self.assertEqual(config.OPTIONS.enableBreak.value, False)
         self.assertEqual(config.OPTIONS.emitBackend.value, False)
-        self.assertEqual(config.OPTIONS.arch.value, 'zx48k')
+        self.assertEqual(config.OPTIONS.architecture.value, None)
         # private options that cannot be accessed with #pragma
         self.assertEqual(config.OPTIONS.option('__DEFINES').value, {})
         self.assertEqual(config.OPTIONS.explicit.value, False)
@@ -49,7 +49,7 @@ def test_initted_values(self):
                                                                  'Sinclair',
                                                                  'StdErrFileName',
                                                                  '__DEFINES',
-                                                                 'arch',
+                                                                 'architecture',
                                                                  'arrayCheck',
                                                                  'array_base',
                                                                  'autorun',