diff options
author | R David Murray <rdmurray@bitdance.com> | 2011-03-29 15:32:35 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2011-03-29 15:32:35 (GMT) |
commit | 86cc82e36f24e3c57bd08a49190d798afb5e6b19 (patch) | |
tree | c92b658600a50a2e40018caad8449536f652fc9a /Lib/email | |
parent | 1ebdd714acdfab938cabd45924de4e26b88aec4d (diff) | |
download | cpython-86cc82e36f24e3c57bd08a49190d798afb5e6b19.zip cpython-86cc82e36f24e3c57bd08a49190d798afb5e6b19.tar.gz cpython-86cc82e36f24e3c57bd08a49190d798afb5e6b19.tar.bz2 |
Remove the 'strict' argument to Parser, deprecated since 2.4.
Diffstat (limited to 'Lib/email')
-rw-r--r-- | Lib/email/parser.py | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/Lib/email/parser.py b/Lib/email/parser.py index 6caaff5..ef051fa 100644 --- a/Lib/email/parser.py +++ b/Lib/email/parser.py @@ -15,7 +15,7 @@ from email.message import Message class Parser: - def __init__(self, *args, **kws): + def __init__(self, _class=Message): """Parser of RFC 2822 and MIME email messages. Creates an in-memory object tree representing the email message, which @@ -31,27 +31,7 @@ class Parser: must be created. This class must have a constructor that can take zero arguments. Default is Message.Message. """ - if len(args) >= 1: - if '_class' in kws: - raise TypeError("Multiple values for keyword arg '_class'") - kws['_class'] = args[0] - if len(args) == 2: - if 'strict' in kws: - raise TypeError("Multiple values for keyword arg 'strict'") - kws['strict'] = args[1] - if len(args) > 2: - raise TypeError('Too many arguments') - if '_class' in kws: - self._class = kws['_class'] - del kws['_class'] - else: - self._class = Message - if 'strict' in kws: - warnings.warn("'strict' argument is deprecated (and ignored)", - DeprecationWarning, 2) - del kws['strict'] - if kws: - raise TypeError('Unexpected keyword arguments') + self._class = _class def parse(self, fp, headersonly=False): """Create a message structure from the data in a file. |