Preserve only _patch.temp_original instead of _patch.original

Author: Red4Ru

Lib/unittest/mock.py

@@ -1486,14 +1486,6 @@ def is_local(self):
     def is_local(self, value):
         self._context.is_local = value
 
-    @property
-    def original(self):
-        return self._context.original
-
-    @original.setter
-    def original(self, value):
-        self._context.original = value
-
     @property
     def target(self):
         return self._context.target
@@ -1503,12 +1495,12 @@ def target(self, value):
         self._context.target = value
 
     @property
-    def temp_original(self):  # backwards compatibility
-        return self.original
+    def temp_original(self):
+        return self._context.original
 
     @temp_original.setter
-    def temp_original(self, value):  # backwards compatibility
-        self.original = value
+    def temp_original(self, value):
+        self._context.original = value
 
     def __enter__(self):
         """Perform the patch."""
@@ -1672,16 +1664,16 @@ def __exit__(self, *exc_info):
         if not self.is_started:
             return
 
-        if self.is_local and self.original is not DEFAULT:
-            setattr(self.target, self.attribute, self.original)
+        if self.is_local and self.temp_original is not DEFAULT:
+            setattr(self.target, self.attribute, self.temp_original)
         else:
             delattr(self.target, self.attribute)
             if not self.create and (not hasattr(self.target, self.attribute) or
                         self.attribute in ('__doc__', '__module__',
                                            '__defaults__', '__annotations__',
                                            '__kwdefaults__')):
                 # needed for proxy objects like django settings
-                setattr(self.target, self.attribute, self.original)
+                setattr(self.target, self.attribute, self.temp_original)
 
         exit_stack = self._context.exit_stack
         self._context = None