From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 9 Jan 2016 07:44:10 +0000 (-0800)
Subject: merge from 3.5
X-Git-Tag: v3.6.0a1~809
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b94591c2bfc64f98c9daf35d2481424ca116e077;p=thirdparty%2FPython%2Fcpython.git

merge from 3.5

Issue #22138: Fix mock.patch behavior when patching descriptors. Restore
original values after patching.

Patch contributed by Sean McCully.
---

b94591c2bfc64f98c9daf35d2481424ca116e077