Skip to content

bpo-20180: Simplify char_converter in Argument Clinic. #9828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 3 commits into from
Dec 25, 2018
Merged

bpo-20180: Simplify char_converter in Argument Clinic. #9828

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ff6196
bpo-20180: Simplify char_converter in Argument Clinic.
serhiy-storchaka Oct 12, 2018
8e83dd3
Merge branch 'master' into clinic-char_converter
serhiy-storchaka Dec 25, 2018
d052dbd
Update test_clinic.
serhiy-storchaka Dec 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-20180: Simplify char_converter in Argument Clinic.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Oct 12, 2018
commit 1ff6196de12a401a2caa2f5f8c996aa9d652f890
21 changes: 3 additions & 18 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2556,29 +2556,14 @@ class char_converter(CConverter):
format_unit = 'c'
c_ignored_default = "'\0'"

# characters which need to be escaped in C code
_escapes = {x: r'\%d' % x for x in range(7)}
_escapes.update({
0x07: r'\a',
0x08: r'\b',
0x09: r'\t',
0x0A: r'\n',
0x0B: r'\v',
0x0C: r'\f',
0x0D: r'\r',
0x22: r'\"',
0x27: r'\'',
0x3F: r'\?',
0x5C: r'\\',
})

def converter_init(self):
if isinstance(self.default, self.default_type):
if len(self.default) != 1:
fail("char_converter: illegal default value " + repr(self.default))

c_ord = self.default[0]
self.c_default = "'%s'" % self._escapes.get(c_ord, chr(c_ord))
self.c_default = repr(bytes(self.default))[1:]
if self.c_default == '"\'"':
self.c_default = r"'\''"


@add_legacy_c_converter('B', bitwise=True)
Expand Down