◐ Shell
reader mode source ↗
Skip to content

bpo-27200: fix pathlib, ssl, turtle and weakref doctests#616

Merged
berkerpeksag merged 11 commits into
python:masterfrom
marco-buttu:fix-issue-27200-4th
Apr 13, 2017
Merged

bpo-27200: fix pathlib, ssl, turtle and weakref doctests#616
berkerpeksag merged 11 commits into
python:masterfrom
marco-buttu:fix-issue-27200-4th

Conversation

@marco-buttu

@marco-buttu marco-buttu commented Mar 11, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

This PR is the last but one in the series bpo-27200. The first one was #240, the second one #401, and the third #604. To run the doctests (from the Doc directory):

$ sphinx-build -b doctest . build/doctest \
library/pathlib.rst \
library/ssl.rst \
library/turtle.rst \
library/weakref.rst

@mention-bot

mention-bot commented Mar 11, 2017

Copy link
Copy Markdown

@marco-buttu, thanks for your PR! By analyzing the history of the files in this pull request, we identified @eliben, @birkenfeld, @vsajip, @tiran and @loewis to be potential reviewers.

@marco-buttu marco-buttu changed the title bpo-27200: fix Mar 11, 2017
@marco-buttu
bpo-27200: at the end of the tests the context has to be left clean. …
6ca705b 
The setcontext(Context()) in testsetup does not guarantee that
the tests outside this file have a clean context.  We need to
clean the context at the end of the tests.
@marco-buttu marco-buttu mentioned this pull request Mar 26, 2017
Closed
berkerpeksag
berkerpeksag requested changes Apr 12, 2017
View reviewed changes

@berkerpeksag berkerpeksag left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

I think we also need to following change to ssl examples:

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 01dbecd..02a0c79 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -2262,7 +2262,7 @@ SSL versions 2 and 3 are considered insecure and are therefore dangerous to
 use.  If you want maximum compatibility between clients and servers, it is
 recommended to use :const:`PROTOCOL_TLS_CLIENT` or
 :const:`PROTOCOL_TLS_SERVER` as the protocol version. SSLv2 and SSLv3 are
-disabled by default.
+disabled by default. ::
 
    >>> client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
    >>> client_context.options |= ssl.OP_NO_TLSv1

And there are the other failures:

**********************************************************************
File "library/ssl.rst", line 421, in newcontext
Failed example:
    timestamp
Expected:
    1515144883
Got:
    1515134083.0
**********************************************************************
File "library/ssl.rst", line 424, in newcontext
Failed example:
    print(datetime.utcfromtimestamp(timestamp))
Expected:
    2018-01-05 09:34:43
Got:
    2018-01-05 06:34:43

@marco-buttu marco-buttu mentioned this pull request Apr 12, 2017
Merged
@marco-buttu marco-buttu changed the title bpo-27200: fix pathlib, shlex, ssl, turtle and weakref doctests Apr 12, 2017
@marco-buttu

marco-buttu commented Apr 12, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Thank you very much for your time @berkerpeksag! I made all changes you requested me. Just one question: you got a float from ssl.cert_time_to_seconds(). Is it not a bug in the code? Is it supposed to return both floats and ints?

@berkerpeksag

berkerpeksag commented Apr 12, 2017

Copy link
Copy Markdown
Member

I don't know, it's probably worth doing some VCS archaeology :) I built and ran tests in Python 3.4 with an ancient OpenSSL so this might be the culprit.

@berkerpeksag berkerpeksag merged commit 7b2491a into python:master Apr 13, 2017
@berkerpeksag

berkerpeksag commented Apr 13, 2017

Copy link
Copy Markdown
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@berkerpeksag berkerpeksag berkerpeksag approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@marco-buttu @mention-bot @berkerpeksag @the-knights-who-say-ni