diff options
| author | zsquareplusc <cliechti@gmx.net> | 2019-08-13 13:27:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 13:27:39 +0200 |
| commit | c9e246271e009ce7c076b4bb67c0b67a776364b4 (patch) | |
| tree | 42be73d8d5c7eceba4853af2515deacea6b78ab5 | |
| parent | 7bb1dcc5aea16ca1c957690cb5276df33af1c286 (diff) | |
| parent | 2e276464285df6de830844c5b3abbc3dae8d8298 (diff) | |
| download | pyserial-git-c9e246271e009ce7c076b4bb67c0b67a776364b4.tar.gz | |
Merge pull request #389 from lowell80/master
Replaced RFC 2271 with 2217 in docs & comments
| -rw-r--r-- | documentation/url_handlers.rst | 2 | ||||
| -rw-r--r-- | serial/rfc2217.py | 2 | ||||
| -rw-r--r-- | serial/urlhandler/protocol_rfc2217.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/documentation/url_handlers.rst b/documentation/url_handlers.rst index b4f0da7..5cc1aaa 100644 --- a/documentation/url_handlers.rst +++ b/documentation/url_handlers.rst @@ -48,7 +48,7 @@ Supported options in the URL are: - ``timeout=<value>``: Change network timeout (default 3 seconds). This is useful when the server takes a little more time to send its answers. The - timeout applies to the initial Telnet / :rfc:`2271` negotiation as well + timeout applies to the initial Telnet / :rfc:`2217` negotiation as well as changing port settings or control line change commands. - ``logging={debug|info|warning|error}``: Prints diagnostic messages (not diff --git a/serial/rfc2217.py b/serial/rfc2217.py index d962c1e..c0c3ae3 100644 --- a/serial/rfc2217.py +++ b/serial/rfc2217.py @@ -483,7 +483,7 @@ class Serial(SerialBase): if self.logger: self.logger.info("Negotiated options: {}".format(self._telnet_options)) - # fine, go on, set RFC 2271 specific things + # fine, go on, set RFC 2217 specific things self._reconfigure_port() # all things set up get, now a clean start if not self._dsrdtr: diff --git a/serial/urlhandler/protocol_rfc2217.py b/serial/urlhandler/protocol_rfc2217.py index 8be310f..ebeec3a 100644 --- a/serial/urlhandler/protocol_rfc2217.py +++ b/serial/urlhandler/protocol_rfc2217.py @@ -1,6 +1,6 @@ #! python # -# This is a thin wrapper to load the rfc2271 implementation. +# This is a thin wrapper to load the rfc2217 implementation. # # This file is part of pySerial. https://github.com/pyserial/pyserial # (C) 2011 Chris Liechti <cliechti@gmx.net> |