Merge 7cd627c into 0133fbc

psychopy · Mar 21, 2018 · ede811a · ede811a
2 parents 0133fbc + 7cd627c
commit ede811a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/psychopy/iohub/constants.py b/psychopy/iohub/constants.py
@@ -761,9 +761,9 @@ class VirtualKeyCodes(Constants):
         F4 = 131  # Keycode on Apple wireless kb
         VK_ISO_SECTION = 0x0A
         VK_JIS_YEN = 0x5D
-        VK_JIS_UNDERSCORE = 0x5E,
-        VK_JIS_KEYPAD_COMMA = 0x5F,
-        VK_JIS_EISU = 0x66,
+        VK_JIS_UNDERSCORE = 0x5E
+        VK_JIS_KEYPAD_COMMA = 0x5F
+        VK_JIS_EISU = 0x66
         VK_JIS_KANA = 0x68
         VK_RETURN = 0x24
         VK_TAB = 0x30

diff --git a/psychopy/iohub/devices/keyboard/darwin.py b/psychopy/iohub/devices/keyboard/darwin.py
@@ -24,7 +24,7 @@
 
 import unicodedata
 
-from darwinkey import code2label
+from .darwinkey import code2label
 
 #print2err("code2label: ",code2label)
 carbon_path = ctypes.util.find_library('Carbon')

diff --git a/psychopy/iohub/devices/keyboard/darwinkey.py b/psychopy/iohub/devices/keyboard/darwinkey.py
@@ -86,7 +86,8 @@
 QZ_F4 = 131  # Keycode on Apple wireless kb
 
 code2label = {}
-for k, v in locals().items():
+# need tp copy locals for py3
+for k, v in locals().copy().items():
     if k.startswith('QZ_'):
         klabel = u'' + k[3:].lower()
         code2label[klabel] = v