diff --git a/pyreadline/keysyms/__init__.py b/pyreadline/keysyms/__init__.py index 9cec297..ea1b3be 100644 --- a/pyreadline/keysyms/__init__.py +++ b/pyreadline/keysyms/__init__.py @@ -8,15 +8,15 @@ from . import winconstants if in_ironpython: try: - from ironpython_keysyms import * + from .ironpython_keysyms import * success = True - except ImportError, x: + except ImportError as x: raise else: try: from .keysyms import * success = True - except ImportError, x: + except ImportError as x: pass if not success: diff --git a/pyreadline/keysyms/ironpython_keysyms.py b/pyreadline/keysyms/ironpython_keysyms.py index 331e25c..4d8b23d 100644 --- a/pyreadline/keysyms/ironpython_keysyms.py +++ b/pyreadline/keysyms/ironpython_keysyms.py @@ -8,7 +8,7 @@ #***************************************************************************** from __future__ import print_function, unicode_literals, absolute_import import System -from common import validkey, KeyPress, make_KeyPress_from_keydescr +from .common import validkey, KeyPress, make_KeyPress_from_keydescr c32 = System.ConsoleKey Shift = System.ConsoleModifiers.Shift @@ -105,7 +105,7 @@ def make_keysym(keycode): return sym sym2code_map = {} -for code,sym in code2sym_map.iteritems(): +for code,sym in code2sym_map.items(): sym2code_map[sym.lower()] = code def key_text_to_keyinfo(keytext): @@ -120,7 +120,7 @@ def char_to_keyinfo(char, control=False, meta=False, shift=False): vk = (ord(char)) if vk & 0xffff == 0xffff: print('VkKeyScan("%s") = %x' % (char, vk)) - raise ValueError, 'bad key' + raise ValueError('bad key') if vk & 0x100: shift = True if vk & 0x200: diff --git a/pyreadline/keysyms/keysyms.py b/pyreadline/keysyms/keysyms.py index 70d99ad..24b8886 100644 --- a/pyreadline/keysyms/keysyms.py +++ b/pyreadline/keysyms/keysyms.py @@ -103,7 +103,7 @@ def char_to_keyinfo(char, control=False, meta=False, shift=False): vk = VkKeyScan(ord(char)) if vk & 0xffff == 0xffff: print('VkKeyScan("%s") = %x' % (char, vk)) - raise ValueError, 'bad key' + raise ValueError('bad key') if vk & 0x100: k.shift = True if vk & 0x200: