Skip to content

bpo-37116: Use PEP 570 syntax for positional-only parameters. #13700

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 13 commits into from
Jun 1, 2019
Merged

bpo-37116: Use PEP 570 syntax for positional-only parameters. #13700

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c10b324
Use PEP 570 syntax for positional-only parameters.
serhiy-storchaka Mar 29, 2019
8004b5d
Merge branch 'master' into use-pep-570
serhiy-storchaka Apr 1, 2019
e68b934
Revert changes in argparse and optparse.
serhiy-storchaka Apr 1, 2019
8cb95e0
Merge branch 'master' into use-pep-570
serhiy-storchaka May 31, 2019
ba68739
Remove unneeded settings of __text_signature__.
serhiy-storchaka May 31, 2019
2cf894d
Merge branch 'master' into use-pep-570
serhiy-storchaka May 31, 2019
3a52252
Merge branch 'master' into use-pep-570
serhiy-storchaka May 31, 2019
1529d55
Fix tests.
serhiy-storchaka May 31, 2019
f12a89c
Keep changes that can be applied in 3.8.
serhiy-storchaka May 31, 2019
c504dc9
Update addClassCleanup and some mock methods.
serhiy-storchaka Jun 1, 2019
6b69757
Get rid of _mock_self.
serhiy-storchaka Jun 1, 2019
105c264
Remove a note about deprecation from What's New.
serhiy-storchaka Jun 1, 2019
aa4bdae
Update the documentation.
serhiy-storchaka Jun 1, 2019
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
Prev Previous commit
Next Next commit
Revert changes in argparse and optparse.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Apr 1, 2019
commit e68b9342e01ea2aceb00d37af7fbdd789457f7b7
4 changes: 2 additions & 2 deletions Lib/argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ class Namespace(_AttributeHolder):
string representation.
"""

def __init__(self, /, **kwargs):
def __init__(self, **kwargs):
for name in kwargs:
setattr(self, name, kwargs[name])

Expand Down Expand Up @@ -1297,7 +1297,7 @@ def _registry_get(self, registry_name, value, default=None):
# ==================================
# Namespace default accessor methods
# ==================================
def set_defaults(self, /, **kwargs):
def set_defaults(self, **kwargs):
self._defaults.update(kwargs)

# if these defaults match any existing arguments, replace
Expand Down
20 changes: 11 additions & 9 deletions Lib/optparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,13 +992,14 @@ def _check_conflict(self, option):
if not (c_option._short_opts or c_option._long_opts):
c_option.container.option_list.remove(c_option)

def add_option(self, option, /, *args, **kwargs):
def add_option(self, *args, **kwargs):
"""add_option(Option)
add_option(opt_str, ..., kwarg=val, ...)
"""
if isinstance(option, str):
option = self.option_class(option, *args, **kwargs)
elif not args and not kwargs:
if isinstance(args[0], str):
option = self.option_class(*args, **kwargs)
elif len(args) == 1 and not kwargs:
option = args[0]
if not isinstance(option, Option):
raise TypeError("not an Option instance: %r" % option)
else:
Expand Down Expand Up @@ -1293,7 +1294,7 @@ def set_process_default_values(self, process):
def set_default(self, dest, value):
self.defaults[dest] = value

def set_defaults(self, /, **kwargs):
def set_defaults(self, **kwargs):
self.defaults.update(kwargs)

def _get_all_options(self):
Expand All @@ -1319,11 +1320,12 @@ def get_default_values(self):

# -- OptionGroup methods -------------------------------------------

def add_option_group(self, group, /, *args, **kwargs):
def add_option_group(self, *args, **kwargs):
# XXX lots of overlap with OptionContainer.add_option()
if isinstance(group, str):
group = OptionGroup(self, group, *args, **kwargs)
elif not args and not kwargs:
if isinstance(args[0], str):
group = OptionGroup(self, *args, **kwargs)
elif len(args) == 1 and not kwargs:
group = args[0]
if not isinstance(group, OptionGroup):
raise TypeError("not an OptionGroup instance: %r" % group)
if group.parser is not self:
Expand Down