Skip to content

Commit aff7e5a

Browse files
rachmadaniHaryonorachmadaniHaryono
committed
fix: SyntaxError
1 parent f1e5513 commit aff7e5a

File tree

3 files changed

+127
-123
lines changed

3 files changed

+127
-123
lines changed

‎pyrepl/keymaps.py

Lines changed: 87 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -18,68 +18,69 @@
1818
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1919

2020
reader_emacs_keymap = tuple(
21-
[(r'\C-a', 'beginning-of-line'),
22-
(r'\C-b', 'left'),
23-
(r'\C-c', 'interrupt'),
24-
(r'\C-d', 'delete'),
25-
(r'\C-e', 'end-of-line'),
26-
(r'\C-f', 'right'),
27-
(r'\C-g', 'cancel'),
28-
(r'\C-h', 'backspace'),
29-
(r'\C-j', 'self-insert'),
30-
(r'\<return>', 'accept'),
31-
(r'\C-k', 'kill-line'),
32-
(r'\C-l', 'clear-screen'),
33-
# (r'\C-m', 'accept'),
34-
(r'\C-q', 'quoted-insert'),
35-
(r'\C-t', 'transpose-characters'),
36-
(r'\C-u', 'unix-line-discard'),
37-
(r'\C-v', 'quoted-insert'),
38-
(r'\C-w', 'unix-word-rubout'),
39-
(r'\C-x\C-u', 'upcase-region'),
40-
(r'\C-y', 'yank'),
41-
(r'\C-z', 'suspend'),
42-
43-
(r'\M-b', 'backward-word'),
44-
(r'\M-c', 'capitalize-word'),
45-
(r'\M-d', 'kill-word'),
46-
(r'\M-f', 'forward-word'),
47-
(r'\M-l', 'downcase-word'),
48-
(r'\M-t', 'transpose-words'),
49-
(r'\M-u', 'upcase-word'),
50-
(r'\M-y', 'yank-pop'),
51-
(r'\M--', 'digit-arg'),
52-
(r'\M-0', 'digit-arg'),
53-
(r'\M-1', 'digit-arg'),
54-
(r'\M-2', 'digit-arg'),
55-
(r'\M-3', 'digit-arg'),
56-
(r'\M-4', 'digit-arg'),
57-
(r'\M-5', 'digit-arg'),
58-
(r'\M-6', 'digit-arg'),
59-
(r'\M-7', 'digit-arg'),
60-
(r'\M-8', 'digit-arg'),
61-
(r'\M-9', 'digit-arg'),
62-
(r'\M-\n', 'self-insert'),
63-
(r'\<backslash>', 'self-insert')] + \
64-
[(c, 'self-insert')
65-
for c in map(chr, range(32, 127)) if c <> '\\'] + \
66-
[(c, 'self-insert')
67-
for c in map(chr, range(128, 256)) if c.isalpha()] + \
68-
[(r'\<up>', 'up'),
69-
(r'\<down>', 'down'),
70-
(r'\<left>', 'left'),
71-
(r'\<right>', 'right'),
72-
(r'\<insert>', 'quoted-insert'),
73-
(r'\<delete>', 'delete'),
74-
(r'\<backspace>', 'backspace'),
75-
(r'\M-\<backspace>', 'backward-kill-word'),
76-
(r'\<end>', 'end'),
77-
(r'\<home>', 'home'),
78-
(r'\<f1>', 'help'),
79-
(r'\EOF', 'end'), # the entries in the terminfo database for xterms
80-
(r'\EOH', 'home'), # seem to be wrong. this is a less than ideal
81-
# workaround
82-
])
21+
[
22+
(r"\C-a", "beginning-of-line"),
23+
(r"\C-b", "left"),
24+
(r"\C-c", "interrupt"),
25+
(r"\C-d", "delete"),
26+
(r"\C-e", "end-of-line"),
27+
(r"\C-f", "right"),
28+
(r"\C-g", "cancel"),
29+
(r"\C-h", "backspace"),
30+
(r"\C-j", "self-insert"),
31+
(r"\<return>", "accept"),
32+
(r"\C-k", "kill-line"),
33+
(r"\C-l", "clear-screen"),
34+
# (r'\C-m', 'accept'),
35+
(r"\C-q", "quoted-insert"),
36+
(r"\C-t", "transpose-characters"),
37+
(r"\C-u", "unix-line-discard"),
38+
(r"\C-v", "quoted-insert"),
39+
(r"\C-w", "unix-word-rubout"),
40+
(r"\C-x\C-u", "upcase-region"),
41+
(r"\C-y", "yank"),
42+
(r"\C-z", "suspend"),
43+
(r"\M-b", "backward-word"),
44+
(r"\M-c", "capitalize-word"),
45+
(r"\M-d", "kill-word"),
46+
(r"\M-f", "forward-word"),
47+
(r"\M-l", "downcase-word"),
48+
(r"\M-t", "transpose-words"),
49+
(r"\M-u", "upcase-word"),
50+
(r"\M-y", "yank-pop"),
51+
(r"\M--", "digit-arg"),
52+
(r"\M-0", "digit-arg"),
53+
(r"\M-1", "digit-arg"),
54+
(r"\M-2", "digit-arg"),
55+
(r"\M-3", "digit-arg"),
56+
(r"\M-4", "digit-arg"),
57+
(r"\M-5", "digit-arg"),
58+
(r"\M-6", "digit-arg"),
59+
(r"\M-7", "digit-arg"),
60+
(r"\M-8", "digit-arg"),
61+
(r"\M-9", "digit-arg"),
62+
(r"\M-\n", "self-insert"),
63+
(r"\<backslash>", "self-insert"),
64+
]
65+
+ [(c, "self-insert") for c in map(chr, range(32, 127)) if c != "\\"]
66+
+ [(c, "self-insert") for c in map(chr, range(128, 256)) if c.isalpha()]
67+
+ [
68+
(r"\<up>", "up"),
69+
(r"\<down>", "down"),
70+
(r"\<left>", "left"),
71+
(r"\<right>", "right"),
72+
(r"\<insert>", "quoted-insert"),
73+
(r"\<delete>", "delete"),
74+
(r"\<backspace>", "backspace"),
75+
(r"\M-\<backspace>", "backward-kill-word"),
76+
(r"\<end>", "end"),
77+
(r"\<home>", "home"),
78+
(r"\<f1>", "help"),
79+
(r"\EOF", "end"), # the entries in the terminfo database for xterms
80+
(r"\EOH", "home"), # seem to be wrong. this is a less than ideal
81+
# workaround
82+
]
83+
)
8384

8485
hist_emacs_keymap = reader_emacs_keymap + (
8586
(r'\C-n', 'next-history'),
@@ -98,37 +99,34 @@
9899
python_emacs_keymap = comp_emacs_keymap + (
99100
(r'\n', 'maybe-accept'),
100101
(r'\M-\n', 'self-insert'))
101-
102+
102103
reader_vi_insert_keymap = tuple(
103-
[(c, 'self-insert')
104-
for c in map(chr, range(32, 127)) if c <> '\\'] + \
105-
[(c, 'self-insert')
106-
for c in map(chr, range(128, 256)) if c.isalpha()] + \
107-
[(r'\C-d', 'delete'),
108-
(r'\<backspace>', 'backspace'),
109-
('')])
104+
[(c, "self-insert") for c in map(chr, range(32, 127)) if c != "\\"]
105+
+ [(c, "self-insert") for c in map(chr, range(128, 256)) if c.isalpha()]
106+
+ [(r"\C-d", "delete"), (r"\<backspace>", "backspace"), ("")]
107+
)
110108

111109
reader_vi_command_keymap = tuple(
112110
[
113-
('E', 'enter-emacs-mode'),
114-
('R', 'enter-replace-mode'),
115-
('dw', 'delete-word'),
116-
('dd', 'delete-line'),
117-
118-
('h', 'left'),
119-
('i', 'enter-insert-mode'),
120-
('j', 'down'),
121-
('k', 'up'),
122-
('l', 'right'),
123-
('r', 'replace-char'),
124-
('w', 'forward-word'),
125-
('x', 'delete'),
126-
('.', 'repeat-edit'), # argh!
127-
(r'\<insert>', 'enter-insert-mode'),
128-
] +
129-
[(c, 'digit-arg') for c in '01234567689'] +
130-
[])
131-
111+
("E", "enter-emacs-mode"),
112+
("R", "enter-replace-mode"),
113+
("dw", "delete-word"),
114+
("dd", "delete-line"),
115+
("h", "left"),
116+
("i", "enter-insert-mode"),
117+
("j", "down"),
118+
("k", "up"),
119+
("l", "right"),
120+
("r", "replace-char"),
121+
("w", "forward-word"),
122+
("x", "delete"),
123+
(".", "repeat-edit"), # argh!
124+
(r"\<insert>", "enter-insert-mode"),
125+
]
126+
+ [(c, "digit-arg") for c in "01234567689"]
127+
+ []
128+
)
129+
132130

133131
reader_keymaps = {
134132
'emacs' : reader_emacs_keymap,
@@ -137,4 +135,3 @@
137135
}
138136

139137
del c # from the listcomps
140-

‎pyrepl/pygame_console.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class PyGameConsole(Console):
8989
height,
9090
width,
9191
"""
92-
92+
9393
def __init__(self):
9494
self.pygame_screen = pygame.display.set_mode((800, 600))
9595
pygame.font.init()
@@ -105,7 +105,7 @@ def __init__(self):
105105
pygame.display.update()
106106
pygame.event.set_allowed(None)
107107
pygame.event.set_allowed(KEYDOWN)
108-
108+
109109
def install_keymap(self, keymap):
110110
"""Install a given keymap.
111111
@@ -130,7 +130,8 @@ def paint_margin(self):
130130
s.fill(c, [0, 600 - bmargin, 800, bmargin])
131131
s.fill(c, [800 - rmargin, 0, lmargin, 600])
132132

133-
def refresh(self, screen, (cx, cy)):
133+
def refresh(self, screen, c):
134+
c = cx, cy
134135
self.screen = screen
135136
self.pygame_screen.fill(colors.bg,
136137
[0, tmargin + self.cur_top + self.scroll,
@@ -282,9 +283,9 @@ def flushoutput(self):
282283

283284
def forgetinput(self):
284285
"""Forget all pending, but not yet processed input."""
285-
while pygame.event.poll().type <> NOEVENT:
286+
while pygame.event.poll().type != NOEVENT:
286287
pass
287-
288+
288289
def getpending(self):
289290
"""Return the characters that have been typed but not yet
290291
processed."""
@@ -299,7 +300,7 @@ def getpending(self):
299300

300301
def wait(self):
301302
"""Wait for an event."""
302-
raise Exception, "erp!"
303+
raise Exception("erp!")
303304

304305
def repaint(self):
305306
# perhaps we should consolidate grobs?

‎pyrepl/pygame_keymap.py

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,27 @@ def _parse_key1(key, s):
8989
ret = _escapes[c]
9090
s += 2
9191
elif c == "c":
92-
if key[s + 2] != '-':
93-
raise KeySpecError, \
94-
"\\C must be followed by `-' (char %d of %s)"%(
95-
s + 2, repr(key))
92+
if key[s + 2] != "-":
93+
raise KeySpecError(
94+
"\\C must be followed by `-' (char %d of %s)"
95+
% (s + 2, repr(key))
96+
)
9697
if ctrl:
97-
raise KeySpecError, "doubled \\C- (char %d of %s)"%(
98-
s + 1, repr(key))
98+
raise KeySpecError(
99+
"doubled \\C- (char %d of %s)" % (s + 1, repr(key))
100+
)
99101
ctrl = 1
100102
s += 3
101103
elif c == "m":
102-
if key[s + 2] != '-':
103-
raise KeySpecError, \
104-
"\\M must be followed by `-' (char %d of %s)"%(
105-
s + 2, repr(key))
104+
if key[s + 2] != "-":
105+
raise KeySpecError(
106+
"\\M must be followed by `-' (char %d of %s)"
107+
% (s + 2, repr(key))
108+
)
106109
if meta:
107-
raise KeySpecError, "doubled \\M- (char %d of %s)"%(
108-
s + 1, repr(key))
110+
raise KeySpecError(
111+
"doubled \\M- (char %d of %s)" % (s + 1, repr(key))
112+
)
109113
meta = 1
110114
s += 3
111115
elif c.isdigit():
@@ -119,22 +123,25 @@ def _parse_key1(key, s):
119123
elif c == '<':
120124
t = key.find('>', s)
121125
if t == -1:
122-
raise KeySpecError, \
123-
"unterminated \\< starting at char %d of %s"%(
124-
s + 1, repr(key))
126+
raise KeySpecError(
127+
"unterminated \\< starting at char %d of %s"
128+
% (s + 1, repr(key))
129+
)
125130
try:
126131
ret = _keynames[key[s+2:t].lower()]
127132
s = t + 1
128133
except KeyError:
129-
raise KeySpecError, \
130-
"unrecognised keyname `%s' at char %d of %s"%(
131-
key[s+2:t], s + 2, repr(key))
134+
raise KeySpecError(
135+
"unrecognised keyname `%s' at char %d of %s"
136+
% (key[s + 2 : t], s + 2, repr(key))
137+
)
132138
if ret is None:
133139
return None, s
134140
else:
135-
raise KeySpecError, \
136-
"unknown backslash escape %s at char %d of %s"%(
137-
`c`, s + 2, repr(key))
141+
raise KeySpecError(
142+
"unknown backslash escape %s at char %d of %s"
143+
% (repr(c), s + 2, repr(key))
144+
)
138145
else:
139146
if ctrl:
140147
ret = chr(ord(key[s]) & 0x1f) # curses.ascii.ctrl()
@@ -160,9 +167,8 @@ def _compile_keymap(keymap):
160167
r.setdefault(key[0], {})[key[1:]] = value
161168
for key, value in r.items():
162169
if value.has_key(()):
163-
if len(value) <> 1:
164-
raise KeySpecError, \
165-
"key definitions for %s clash"%(value.values(),)
170+
if len(value) != 1:
171+
raise KeySpecError("key definitions for %s clash" % (value.values(),))
166172
else:
167173
r[key] = value[()]
168174
else:
@@ -202,8 +208,8 @@ def unparse_key(keyseq):
202208
return ''
203209
name, s = keyname(keyseq)
204210
if name:
205-
if name <> 'escape' or s == len(keyseq):
206-
return '\\<' + name + '>' + unparse_key(keyseq[s:])
211+
if name != "escape" or s == len(keyseq):
212+
return "\\<" + name + ">" + unparse_key(keyseq[s:])
207213
else:
208214
return '\\M-' + unparse_key(keyseq[1:])
209215
else:
@@ -226,7 +232,7 @@ def _unparse_keyf(keyseq):
226232
return []
227233
name, s = keyname(keyseq)
228234
if name:
229-
if name <> 'escape' or s == len(keyseq):
235+
if name != "escape" or s == len(keyseq):
230236
return [name] + _unparse_keyf(keyseq[s:])
231237
else:
232238
rest = _unparse_keyf(keyseq[1:])

0 commit comments

Comments
 (0)