Skip to content
Prev Previous commit
Next Next commit
Merge branch 'master' into cached-property
* master: (107 commits)
  bpo-22057: Clarify eval() documentation (GH-8812)
  bpo-34318: Convert deprecation warnings to errors in assertRaises() etc. (GH-8623)
  bpo-22602: Raise an exception in the UTF-7 decoder for ill-formed sequences starting with "+". (GH-8741)
  bpo-34415: Updated logging.Formatter docstring. (GH-8811)
  bpo-34432: doc Mention complex and decimal.Decimal on str.format not about locales (GH-8808)
  bpo-34381: refer to 'Running & Writing Tests' in README.rst (GH-8797)
  Improve error message when mock.assert_has_calls fails (GH-8205)
  Warn not to set SIGPIPE to SIG_DFL (#6773)
  bpo-34419: selectmodule.c does not compile on HP-UX due to bpo-31938 (GH-8796)
  bpo-34418: Fix HTTPErrorProcessor documentation (GH-8793)
  bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787)
  bpo-34217: Use lowercase for windows headers (GH-8472)
  bpo-34395: Fix memory leaks caused by incautious usage of PyMem_Resize(). (GH-8756)
  bpo-34405: Updated to OpenSSL 1.1.0i for Windows builds. (GH-8775)
  bpo-34384: Fix os.readlink() on Windows (GH-8740)
  closes bpo-34400: Fix undefined behavior in parsetok(). (GH-4439)
  bpo-34399: 2048 bits RSA keys and DH params (#8762)
  Make regular expressions in test_tasks.py raw strings. (GH-8759)
  smtplib documentation fixes (GH-8708)
  Fix misindented yaml in logging how to example (GH-8604)
  ...
  • Loading branch information
carljm committed Aug 19, 2018
commit 977ece0d44fe3b367967e74f15e86876b9420dec

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.