diff --git a/binarycpython/tests/test_functions.py b/binarycpython/tests/test_functions.py index 46bfbbbfce4cc5fdf53b511f3ddf3999c4630736..86c24698c9575feb330ef3ac62f738c1924e39df 100644 --- a/binarycpython/tests/test_functions.py +++ b/binarycpython/tests/test_functions.py @@ -13,7 +13,6 @@ from binarycpython.utils.functions import * TMP_DIR = temp_dir("tests", "test_functions") - class dummy: """ Dummy class to be used in the merge_dicts @@ -106,14 +105,16 @@ class test_temp_dir(unittest.TestCase): Test making a temp directory and comparing that to what it should be """ + # binary_c_temp_dir = temp_dir() + username = get_username() general_temp_dir = tempfile.gettempdir() self.assertTrue( - os.path.isdir(os.path.join(general_temp_dir, "binary_c_python")) + os.path.isdir(os.path.join(general_temp_dir, "binary_c_python-{}".format(username))) ) self.assertTrue( - os.path.join(general_temp_dir, "binary_c_python") + os.path.join(general_temp_dir, "binary_c_python-{}".format(username)) ) == binary_c_temp_dir diff --git a/binarycpython/utils/functions.py b/binarycpython/utils/functions.py index 9c304b5577e0d3ae850314cc51bb15d45810f6de..e67686fcb2500341991641fdec39a26ceacea78c 100644 --- a/binarycpython/utils/functions.py +++ b/binarycpython/utils/functions.py @@ -67,7 +67,7 @@ def check_if_in_shell(): return in_shell -def ANSI_colours(self): +def get_ANSI_colours(): # ANSI colours dictionary foreground_colours = { "red": Fore.RED, diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py index 81ae2cae7534198a9f8cbeaf123b4f2a905b0b57..b98a129fc91da47617992d000a99cb37448fd42d 100644 --- a/binarycpython/utils/grid.py +++ b/binarycpython/utils/grid.py @@ -80,7 +80,7 @@ from binarycpython.utils.functions import ( trem, conv_time_units, mem_use, - ANSI_colours, + get_ANSI_colours, check_if_in_shell, format_number, ) @@ -175,7 +175,7 @@ class Population: self.in_shell = check_if_in_shell() # ANSI colours: use them if in a shell - self.ANSI_colours = ANSI_colours() + self.ANSI_colours = get_ANSI_colours() if self.in_shell == False: for c in self.ANSI_colours: self.ANSI_colours[c] = ""