special: added len check to special(), test, fixed text, ...

dynamic_import/module.py

@@ -25,7 +25,7 @@ def __init__(self, package, info, module, *args, **kwargs):
         super().__init__(package, None, *args, **kwargs)
         self.__PACKAGE__ = package
         self.__INFO__ = info
-        # note: ^ this needs to mimic magic method name since those are made to raise error
+        # note: ^ these needs to mimic magic method name since those are made to raise error
 
         # only include special name from previous module, all other names should be
         # imported through this `Module`

dynamic_import/prep.py

@@ -26,7 +26,12 @@ def prep_package(pkg_name, pkg_path, recursive, exclude_file, exclude_dir):
     '''
     info = {}
     dir_mtime = {}
-    for module, file_path, mtime in prep_files(pkg_name, pkg_path, recursive, dir_mtime, exclude_file, exclude_dir):
+    for module, file_path, mtime in prep_files(pkg_name,
+                                               pkg_path,
+                                               recursive,
+                                               dir_mtime,
+                                               exclude_file,
+                                               exclude_dir):
         for var, variables in prep_variables(module, file_path):
             info[var] = (module, file_path, variables, mtime)
     return info, dir_mtime
@@ -78,8 +83,8 @@ def prep_files(pkg_name, pkg_path, recursive, dir_mtime, exclude_file, exclude_d
                         yield f'{module_name}', file_path, mtime
                     else:
                         yield f'{module_name}.{file.split(".")[0]}', file_path, mtime
-                        # ('pkg.sub.module', '/path/pkg/sub/module.py', 123.45)
-                        # ('pkg.sub.module', '/path/pkg/sub/module.cpython-312-x86_64-linux-gnu.so', 123.45)
+                        # ('pkg.sub.module', '/pkg/sub/module.py', 123.45)
+                        # ('pkg.sub.module', '/pkg/sub/module*.so', 123.45)
         if not recursive:
             break
 

dynamic_import/special.py

@@ -21,7 +21,7 @@ def special(iterable, error=False):
             - if `error=True` will raise exception if special name is found.
     '''
     for name in iterable:
-        if (name[0:2] == '__' == name[-2:]) and (name[2] != '_' != name[-3]):
+        if len(name) > 4 and (name[0:2] == '__' == name[-2:]) and (name[2] != '_' != name[-3]):
             if error:
                 raise ValueError(f'special name like {name!r} is not supported')
             continue

dynamic_import/version.py

@@ -1 +1 @@
-version = '2024.4.2'
+version = '2024.5.2'

test/conflict/my_func.py

@@ -2,3 +2,7 @@
 
 def my_func():
     return 'my_func() called'
+
+
+def another_func():
+    return 'another_func() called'

test/conflict_test.py

@@ -1,3 +1,17 @@
+import conflict
+
+
 def test_conflict():
-    from conflict import my_func
+    from conflict import my_func, another_func
     assert my_func() == 'my_func() called'
+    assert another_func() == 'another_func() called'
+
+
+def test_multiple_conflict():
+    assert conflict.another_func() == 'another_func() called'
+    assert conflict.my_func() == 'my_func() called'
+
+
+def test_multiple_conflict2():
+    assert conflict.another_func() == 'another_func() called'
+    assert conflict.my_func() == 'my_func() called'

test/record_test.py

@@ -18,7 +18,7 @@ def test_add_record(tmp_dir):
     with open(record_file, 'rb') as file:
         assert file.read() == b'pkg/__pycache__/__init__.importer-313.pyc,,\r\n'
 
-    # try again, shouldn't change since cache path alrady exists.
+    # try again, shouldn't change since cache path already exists.
     add_record(pkg_name, cache_path)
     with open(record_file, 'rb') as file:
         assert file.read() == b'pkg/__pycache__/__init__.importer-313.pyc,,\r\n'

test/special_test.py

@@ -5,8 +5,10 @@
 
 
 def test_special():
-    my_list = ['first', '__name__', '_name', 'name_', 'name', 'name__', '__name', '___name___', '', 'last']
-    result = ('first', '_name', 'name_', 'name', 'name__', '__name', '___name___', '', 'last')
+    my_list = ['first', '__name__', '_name', 'name_', 'name', 'name__', '__name', '___name___',
+               '', 'last', '__q__', '____', '___', '__', '_']
+    result = ('first', '_name', 'name_', 'name', 'name__', '__name', '___name___',
+              '', 'last', '____', '___', '__', '_')
     assert tuple(special(my_list)) == result
 
     with pytest.raises(ValueError, match="special name like '__name__' is not supported"):