Skip to content

Conversation

@matrixise
Copy link
Member

[2.7] Docs: fix some wrong words (GH-6987)

Fix typos in code comments: bdb.py and configure.ac..
(cherry picked from commit b5c246f)

Co-authored-by: Eitan Adler grimreaper@users.noreply.github.com
Co-authored-by: Stéphane Wirtel stephane@wirtel.be

miss-islington and others added 30 commits April 6, 2018 22:01
…addch (pythonGH-5179) (pythonGH-6405)

(cherry picked from commit ef5ce88)

Co-authored-by: Jay Crotts <crotts.jay@gmail.com>
…ettext`` script. (pythonGH-6259) (pythonGH-6436)

Based on patch by Oleg Krasnikov.
(cherry picked from commit c93938b)
…ythonGH-6469)

These include:

- bpo-32726: Provide an additional, more modern macOS installer variant that
  supports macOS 10.9+ systems in 64-bit mode only. Upgrade the supplied
  third-party libraries to OpenSSL 1.0.2n and SQLite 3.22.0. The 10.9+
  installer now supplies its own private copy of Tcl/Tk 8.6.8.

- bpo-24414: Default macOS deployment target is now set by ``configure`` to
  the build system's OS version (as is done by Python 3), not ``10.4``;
  override with, for example, ``./configure MACOSX_DEPLOYMENT_TARGET=10.4``.

- bpo-19019: All 2.7 macOS installer variants now supply their own version
  of ``OpenSSL 1.0.2``; the Apple-supplied SSL libraries and root
  certificates are not longer used.  The ``Installer Certificate`` command
  in ``/Applications/Python 2.7`` may be used to download and install a
  default set of root certificates from the third-party ``certifi`` package.

- bpo-11485: python.org macOS Pythons no longer supply a default SDK value
  (e.g. ``-isysroot /``) or specific compiler version default (e.g.
  ``gcc-4.2``) when building extension modules.  Use ``CC``, ``SDKROOT``,
  and ``DEVELOPER_DIR`` environment variables to override compilers or to
  use an SDK.  See Apple's ``xcrun`` man page for more info.

- prepare for pending Apple removal of 32-bit support in future macOS release
…ythonGH-6408) (pythonGH-6471)

(cherry picked from commit 76215a4)

Co-authored-by: Ned Deily <nad@python.org>
In fact, we now require a newer Sphinx version because APIs have moved around..
(cherry picked from commit acfb087)
…honGH-6510)

`test_urllib2net.OtherNetworkTests.test_sites_no_connection_close`
used `http://www.imdb.com/` but it is moved to https so the test is
not valid anymore.  Skip test for the moment to allow CI to proceed.
(cherry picked from commit 36d56ea)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
…object. (pythonGH-6519) (pythonGH-6532)

Converting with line_info=False and col_info=True crashed before.
(cherry picked from commit e5362ea)
… (pythonGH-6542)

(cherry picked from commit 4b685bf)

Update only the documentation about image formats.
Upgrade ensurepip to bundle pip 10.0.1
(cherry picked from commit 0399cf9)

Co-authored-by: Paul Moore <p.f.moore@gmail.com>
…honGH-6505) (pythonGH-6562)

Also update PIL doc references to Pillow.
(cherry picked from commit 'b81ca28b378c8b29204a37f8bd433a3379f53f7d')

Co-authored-by: 'Andrés Delfino.34587441+andresdelfino@users.noreply.github.com'
We don't use debugger on Travis.
(cherry picked from commit 8ff5356)
This was broken by poor automated translation back in 6e3dbbd.
…. (pythonGH-6607)

(cherry picked from commit 67a8f4f)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte
aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC
8 are starting to use alignment information to do store-merging. So, the "long
double" needs to be changed to a simple "double" as was long ago done in Python
3 by e348c8d. For 2.7, we need to add some
dummy padding to make sure _PyGC_Head stays the same size.
…display it in html (pythonGH-6442). (pythonGH-6650)

(cherry picked from commit 7d68bfa)

Co-authored-by: sblondon <sblondon@users.noreply.github.com>
…hon#6689)

(cherry picked from commit fc6aa28)

Co-authored-by: Ned Deily <nad@python.org>
(cherry picked from commit 491bbed)

Co-authored-by: lekma <lekmalek@gmail.com>
…ction() (pythonGH-6223) (pythonGH-6646)

(cherry picked from commit 9f3535c)

Co-authored-by: Bo Bayles <bbayles@gmail.com>
miss-islington and others added 13 commits October 26, 2018 20:09
…thonGH-10144)

Specify that blocks are non-overlapping. Change '!=' to '<'.
(cherry picked from commit d9bff4e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
…9820) (pythonGH-10157)

Referring to ``pytest`` as ``py.test`` is deprecated..
(cherry picked from commit d855f2f)

Co-authored-by: Andreas Pelme <andreas@pelme.se>
)

Based on the investigation by Xiang Zhang.
(cherry picked from commit df13df4)
…H-10188)

(cherry picked from commit 18d57b4)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
(cherry picked from commit c0799ec)

Co-authored-by: Gus Goulart <augusto@goulart.me>
…thonGH-9969)

Adding `max_num_fields` to `cgi.FieldStorage` to make DOS attacks harder by
limiting the number of `MiniFieldStorage` objects created by `FieldStorage`.

(cherry picked from commit 2091448)
…gument. (pythonGH-10217)

_io.IncrementalNewlineDecoder's initializer possibly assigns out-of-range
value to the bitwise struct field.
(cherry picked from commit b08746b)

Co-authored-by: Xiang Zhang <angwerzx@126.com>
…up` now match `setup.py` (pythonGH-10293)

This could cause compile errors on macOS or other platforms..
(cherry picked from commit 318ab63)

Co-authored-by: Max Bélanger <aeromax@gmail.com>
(cherry picked from commit fe62d87)

Co-authored-by: İsmail Arılık <arilik.ismail@gmail.com>
Fix typos in code comments: bdb.py and configure.ac..
(cherry picked from commit b5c246f)

Co-authored-by: Eitan Adler grimreaper@users.noreply.github.com
Co-authored-by: Stéphane Wirtel <stephane@wirtel.be>
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for your contribution, we look forward to reviewing it!

@ned-deily
Copy link
Member

@matrixise This PR is faulty. It’s trying to merge from a 2.7 branch into the master branch. Closing

@ned-deily ned-deily closed this Nov 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.