RF WIP import refactoring; remove log.py

- log.py was deprecated early 2012; CHANGE: use psychopy.logging instead of psychopy.log
jeremygray · Dec 6, 2015 · c0868b0 · c0868b0
1 parent 8537a54
commit c0868b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/psychopy/core.py b/psychopy/core.py
@@ -8,7 +8,7 @@
 from clock import MonotonicClock, Clock, CountdownTimer, wait, monotonicClock, getAbsTime
 # always safe to call rush, even if its not going to do anything for a particular OS
 from psychopy.platform_specific import rush
-from . import logging
+from psychopy import logging
 from constants import STARTED, NOT_STARTED, FINISHED
 import subprocess, shlex
 

diff --git a/psychopy/log.py b/psychopy/log.py
diff --git a/psychopy/platform_specific/__init__.py b/psychopy/platform_specific/__init__.py
@@ -26,11 +26,11 @@ def sendStayAwake():
     return False
 
 if sys.platform=='win32':#NB includes vista and 7 (but not sure about vista64)
-    from win32 import *
+    from win32 import *  # pylint: disable=W0401
 elif sys.platform=='darwin':
-    from darwin import *
+    from darwin import *  # pylint: disable=W0401
 elif sys.platform.startswith('linux'):#normally 'linux2'
-    from linux import *
+    from linux import *  # pylint: disable=W0401
 elif sys.platform=='posix':#ever?!
-    from posix import *
+    from posix import *  # pylint: disable=W0401