Merge pull request #99 from PixPanz/dev

Dev
acm-ndsu · Feb 21, 2021 · ca9048d · ca9048d
2 parents 2eb3828 + d048766
commit ca9048d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/game/config.py b/game/config.py
@@ -21,7 +21,8 @@
 SET_NUMBER_OF_CLIENTS_CONTINUE = 1                  # required number of clients to continue running the game; should be None when MIN_CLIENTS or MAX_CLIENTS are used
 
 ALLOWED_MODULES = ["game.client.user_client",       # modules that clients are specifically allowed to access
-                   "game.common.enums"]
+                   "game.common.enums",
+                   "math"]
 
 RESULTS_FILE_NAME = "results.json"                                  # Name and extension of results file
 RESULTS_DIR = os.path.join(os.getcwd(), "logs")                     # Location of the results file

diff --git a/game/utils/validation.py b/game/utils/validation.py
@@ -24,7 +24,8 @@ def verify_code(filename):
                     illegal_imports.append(module)
 
                 line.remove('from')
-                line.remove('import')
+                if 'import' in line:
+                    line.remove('import')
             elif 'import' in line:
                 module = line[line.index('import') + 1]
                 if module not in ALLOWED_MODULES:

diff --git a/wrapper/version.py b/wrapper/version.py
@@ -1,2 +1 @@
-v = '1.1.1'
-
+v = '1.1.2'