Fix imports for all namespace packages (TheAlgorithms#2506)

dhruvmanila · web-flow · commit 9016fe192fdd · 2020-09-28T23:41:04.000+02:00
* Fix imports as they're namespace packages

* Fix import for scripts/validate_filenames.py

* Fix path in doctest
diff --git a/ciphers/affine_cipher.py b/ciphers/affine_cipher.py
@@ -1,7 +1,7 @@
 import random
 import sys
 
-import cryptomath_module as cryptomath
+from . import cryptomath_module as cryptomath
 
 SYMBOLS = (
     r""" !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`"""
diff --git a/ciphers/elgamal_key_generator.py b/ciphers/elgamal_key_generator.py
@@ -2,8 +2,8 @@
 import random
 import sys
 
-import cryptomath_module as cryptoMath
-import rabin_miller as rabinMiller
+from . import cryptomath_module as cryptoMath
+from . import rabin_miller as rabinMiller
 
 min_primitive_root = 3
 
diff --git a/ciphers/rsa_cipher.py b/ciphers/rsa_cipher.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-import rsa_key_generator as rkg
+from . import rsa_key_generator as rkg
 
 DEFAULT_BLOCK_SIZE = 128
 BYTE_SIZE = 256
diff --git a/ciphers/rsa_key_generator.py b/ciphers/rsa_key_generator.py
@@ -2,8 +2,8 @@
 import random
 import sys
 
-import cryptomath_module as cryptoMath
-import rabin_miller as rabinMiller
+from . import cryptomath_module as cryptoMath
+from . import rabin_miller as rabinMiller
 
 
 def main():
diff --git a/ciphers/transposition_cipher_encrypt_decrypt_file.py b/ciphers/transposition_cipher_encrypt_decrypt_file.py
@@ -2,7 +2,7 @@
 import sys
 import time
 
-import transposition_cipher as transCipher
+from . import transposition_cipher as transCipher
 
 
 def main():
diff --git a/data_structures/hashing/double_hash.py b/data_structures/hashing/double_hash.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-from hash_table import HashTable
-from number_theory.prime_numbers import check_prime, next_prime
+from .hash_table import HashTable
+from .number_theory.prime_numbers import check_prime, next_prime
 
 
 class DoubleHash(HashTable):
diff --git a/data_structures/hashing/hash_table.py b/data_structures/hashing/hash_table.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from number_theory.prime_numbers import next_prime
+from .number_theory.prime_numbers import next_prime
 
 
 class HashTable:
diff --git a/data_structures/hashing/hash_table_with_linked_list.py b/data_structures/hashing/hash_table_with_linked_list.py
@@ -1,6 +1,6 @@
 from collections import deque
 
-from hash_table import HashTable
+from .hash_table import HashTable
 
 
 class HashTableWithLinkedList(HashTable):
diff --git a/data_structures/hashing/quadratic_probing.py b/data_structures/hashing/quadratic_probing.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from hash_table import HashTable
+from .hash_table import HashTable
 
 
 class QuadraticProbing(HashTable):
diff --git a/data_structures/linked_list/deque_doubly.py b/data_structures/linked_list/deque_doubly.py
@@ -112,7 +112,7 @@ def remove_first(self):
            ...
         IndexError: remove_first from empty list
         >>> d.add_first('A') # doctest: +ELLIPSIS
-        <linked_list.deque_doubly.LinkedDeque object at ...
+        <data_structures.linked_list.deque_doubly.LinkedDeque object at ...
         >>> d.remove_first()
         'A'
         >>> d.is_empty()
@@ -132,7 +132,7 @@ def remove_last(self):
            ...
         IndexError: remove_first from empty list
         >>> d.add_first('A') # doctest: +ELLIPSIS
-        <linked_list.deque_doubly.LinkedDeque object at ...
+        <data_structures.linked_list.deque_doubly.LinkedDeque object at ...
         >>> d.remove_last()
         'A'
         >>> d.is_empty()
diff --git a/data_structures/queue/circular_queue.py b/data_structures/queue/circular_queue.py
@@ -17,7 +17,7 @@ def __len__(self) -> int:
         >>> len(cq)
         0
         >>> cq.enqueue("A")  # doctest: +ELLIPSIS
-        <circular_queue.CircularQueue object at ...
+        <data_structures.queue.circular_queue.CircularQueue object at ...
         >>> len(cq)
         1
         """
@@ -48,11 +48,11 @@ def enqueue(self, data):
         This function insert an element in the queue using self.rear value as an index
         >>> cq = CircularQueue(5)
         >>> cq.enqueue("A")  # doctest: +ELLIPSIS
-        <circular_queue.CircularQueue object at ...
+        <data_structures.queue.circular_queue.CircularQueue object at ...
         >>> (cq.size, cq.first())
         (1, 'A')
         >>> cq.enqueue("B")  # doctest: +ELLIPSIS
-        <circular_queue.CircularQueue object at ...
+        <data_structures.queue.circular_queue.CircularQueue object at ...
         >>> (cq.size, cq.first())
         (2, 'A')
         """
diff --git a/data_structures/queue/priority_queue_using_list.py b/data_structures/queue/priority_queue_using_list.py
@@ -59,7 +59,7 @@ class FixedPriorityQueue:
     >>> fpq.dequeue()
     Traceback (most recent call last):
     ...
-    priority_queue_using_list.UnderFlowError: All queues are empty
+    data_structures.queue.priority_queue_using_list.UnderFlowError: All queues are empty
     >>> print(fpq)
     Priority 0: []
     Priority 1: []
@@ -141,7 +141,7 @@ class ElementPriorityQueue:
     >>> epq.dequeue()
     Traceback (most recent call last):
         ...
-    priority_queue_using_list.UnderFlowError: The queue is empty
+    data_structures.queue.priority_queue_using_list.UnderFlowError: The queue is empty
     >>> print(epq)
     []
     """
diff --git a/geodesy/lamberts_ellipsoidal_distance.py b/geodesy/lamberts_ellipsoidal_distance.py
@@ -1,6 +1,6 @@
 from math import atan, cos, radians, sin, tan
 
-from haversine_distance import haversine_distance
+from .haversine_distance import haversine_distance
 
 
 def lamberts_ellipsoidal_distance(
diff --git a/greedy_method/test_knapsack.py b/greedy_method/test_knapsack.py
@@ -1,6 +1,6 @@
 import unittest
 
-import greedy_knapsack as kp
+from . import greedy_knapsack as kp
 
 
 class TestClass(unittest.TestCase):
diff --git a/linear_algebra/src/test_linear_algebra.py b/linear_algebra/src/test_linear_algebra.py
@@ -8,7 +8,7 @@
 """
 import unittest
 
-from lib import Matrix, Vector, axpy, squareZeroMatrix, unitBasisVector, zeroVector
+from .lib import Matrix, Vector, axpy, squareZeroMatrix, unitBasisVector, zeroVector
 
 
 class Test(unittest.TestCase):
diff --git a/scripts/validate_filenames.py b/scripts/validate_filenames.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 import os
 
-from build_directory_md import good_file_paths
+try:
+    from .build_directory_md import good_file_paths
+except ImportError:
+    from build_directory_md import good_file_paths
 
 filepaths = list(good_file_paths())
 assert filepaths, "good_file_paths() failed!"
diff --git a/searches/simulated_annealing.py b/searches/simulated_annealing.py
@@ -2,7 +2,7 @@
 import math
 import random
 
-from hill_climbing import SearchProblem
+from .hill_climbing import SearchProblem
 
 
 def simulated_annealing(
