that already contains the right news)

than the one merged from 3.2 to match the actual changes here.

libffi to 3.0.13.  (i'm not sure if it is needed anymore but see
issue 10309 for details which makes no mention of upstream; this
change is already in 3.3 and 3.4 but may need reapplying to 2.7
as done here)

  were missing from a messed up merge during the libffi 3.0.13
  import.  the diffs from upstream libffi 3.0.13 are now small.

  were missing from a messed up merge during the libffi 3.0.13
  import.  the diffs from upstream libffi 3.0.13 are now small.

  that was undone in the merge fun from upstream which already
  had it in 3.0.13.
* Add the missing update to libffi.info.

  that was undone in the merge fun from upstream which already
  had it in 3.0.13.
* Add the missing update to libffi.info.

  in the merge fun from upstream which already had it in 3.0.13.
* Add the missing update to libffi.info.

Patch by Martin Morrison.

raise an ImportError (rather than fatal) when __import__ is not found in __builtins__ (closes #17867)

modules which will typically work when reloaded.

A hack is used to support these functions as their API allowed them to
pass in a file object but then operate as if import had loaded them.
Unfortunately the hack kept a reference around for the file object
passed in which would be unusable on reload since it had been closed.
The solution is to simply use the hack for the initial load but then a
proper loader on the module so that imp.reload() at least has a chance
to work.

(I got a merge conflict on this in urllib.request.rst, which makes no sense to
me.  Hopefully I didn't screw up the previous 3.3 commit.)

I know one of them looks worse, but now it is <80 chars and
matches the 2.7 text.

Behavior confirmation and initial patch by Jessica McKellar.

Behavior confirmation and initial patch by Jessica McKellar.

Original patch by Kushal Das.

Original patch by Kushal Das.

such as was shipped with Centos 5 and Mac OS X 10.4.