Fix lazy_import as well

Author: tobiasdiez

src/sage/all.py

@@ -102,6 +102,7 @@
 
 ################ end setup warnings ###############################
 
+import sage.misc.lazy_import
 lazy_import_lock = sage.misc.lazy_import.lock()
 lazy_import_lock.__enter__()
 
@@ -117,8 +118,6 @@
 from time                import sleep
 from functools import reduce  # in order to keep reduce in python3
 
-import sage.misc.lazy_import
-
 from sage.misc.all       import *         # takes a while
 from sage.typeset.all    import *
 from sage.repl.all       import *

src/sage/misc/lazy_import.pyx

@@ -120,15 +120,15 @@ def lock():
         GuardState.LOCKED
     """
     global startup_state
-    guard_state = GuardState.RUNNING
+    guard_state = GuardState.LOCKED
     yield
-    guard_state = GuardState.FINISHED
+    guard_state = GuardState.UNLOCKED
 
 cdef list imports_resolved_during_locked = []
 
 def _get_imports_resolved_during_locked():
     """
-    Return all lazy imports that were resolved while the layz import guard
+    Return all lazy imports that were resolved while the lazy import guard
     has been locked.
     Only used for integration tests.