[Python-checkins] [3.8] bpo-35168: Make shlex.punctuation_chars read-only (GH-11631) (GH-15927)
Vinay Sajip
webhook-mailer at python.org
Wed Sep 11 08:39:56 EDT 2019
https://github.com/python/cpython/commit/3b92ddb7612fd8fe2be95ff3d8022ed18335b13f
commit: 3b92ddb7612fd8fe2be95ff3d8022ed18335b13f
branch: 3.8
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: GitHub <noreply at github.com>
date: 2019-09-11T13:39:52+01:00
summary:
[3.8] bpo-35168: Make shlex.punctuation_chars read-only (GH-11631) (GH-15927)
(cherry picked from commit 972cf5c06a5ba16ad243a442dbb9c15307fbed95)
Co-authored-by: Alex <a.v.shkop at gmail.com>
files:
A Misc/NEWS.d/next/Library/2019-01-22-09-23-20.bpo-35168.UGv2yW.rst
M Doc/library/shlex.rst
M Lib/shlex.py
M Lib/test/test_shlex.py
diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst
index a8421fdb7008..adc23da6d491 100644
--- a/Doc/library/shlex.rst
+++ b/Doc/library/shlex.rst
@@ -113,7 +113,9 @@ The :mod:`shlex` module defines the following class:
characters, those characters will be used as the punctuation characters. Any
characters in the :attr:`wordchars` attribute that appear in
*punctuation_chars* will be removed from :attr:`wordchars`. See
- :ref:`improved-shell-compatibility` for more information.
+ :ref:`improved-shell-compatibility` for more information. *punctuation_chars*
+ can be set only upon :class:`~shlex.shlex` instance creation and can't be
+ modified later.
.. versionchanged:: 3.6
The *punctuation_chars* parameter was added.
@@ -317,8 +319,8 @@ variables which either control lexical analysis or can be used for debugging:
.. attribute:: shlex.punctuation_chars
- Characters that will be considered punctuation. Runs of punctuation
- characters will be returned as a single token. However, note that no
+ A read-only property. Characters that will be considered punctuation. Runs of
+ punctuation characters will be returned as a single token. However, note that no
semantic validity checking will be performed: for example, '>>>' could be
returned as a token, even though it may not be recognised as such by shells.
diff --git a/Lib/shlex.py b/Lib/shlex.py
index edea07794860..ae0f5ddec187 100644
--- a/Lib/shlex.py
+++ b/Lib/shlex.py
@@ -55,7 +55,7 @@ def __init__(self, instream=None, infile=None, posix=False,
punctuation_chars = ''
elif punctuation_chars is True:
punctuation_chars = '();<>|&'
- self.punctuation_chars = punctuation_chars
+ self._punctuation_chars = punctuation_chars
if punctuation_chars:
# _pushback_chars is a push back queue used by lookahead logic
self._pushback_chars = deque()
@@ -65,6 +65,10 @@ def __init__(self, instream=None, infile=None, posix=False,
t = self.wordchars.maketrans(dict.fromkeys(punctuation_chars))
self.wordchars = self.wordchars.translate(t)
+ @property
+ def punctuation_chars(self):
+ return self._punctuation_chars
+
def push_token(self, tok):
"Push a token onto the stack popped by the get_token method"
if self.debug >= 1:
diff --git a/Lib/test/test_shlex.py b/Lib/test/test_shlex.py
index 376c5e88d381..a21ccd2fdf44 100644
--- a/Lib/test/test_shlex.py
+++ b/Lib/test/test_shlex.py
@@ -353,6 +353,13 @@ def testJoinRoundtrip(self):
resplit = shlex.split(joined)
self.assertEqual(split_command, resplit)
+ def testPunctuationCharsReadOnly(self):
+ punctuation_chars = "/|$%^"
+ shlex_instance = shlex.shlex(punctuation_chars=punctuation_chars)
+ self.assertEqual(shlex_instance.punctuation_chars, punctuation_chars)
+ with self.assertRaises(AttributeError):
+ shlex_instance.punctuation_chars = False
+
# Allow this test to be used with old shlex.py
if not getattr(shlex, "split", None):
diff --git a/Misc/NEWS.d/next/Library/2019-01-22-09-23-20.bpo-35168.UGv2yW.rst b/Misc/NEWS.d/next/Library/2019-01-22-09-23-20.bpo-35168.UGv2yW.rst
new file mode 100644
index 000000000000..10684fdbde2f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-01-22-09-23-20.bpo-35168.UGv2yW.rst
@@ -0,0 +1 @@
+:attr:`shlex.shlex.punctuation_chars` is now a read-only property.
More information about the Python-checkins
mailing list