1 files changed, 23 insertions, 0 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py
index 9630d33..d62a5bd 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -416,6 +416,29 @@ class Pickler:
                 write(SETITEM)
 
         getstate = getattr(obj, "__getstate__", None)
+
+        # A class may define both __getstate__ and __getnewargs__.
+        # If they are the same function, we ignore __getstate__.
+        # This is for the benefit of protocols 0 and 1, which don't
+        # use __getnewargs__.  Note that the only way to make them
+        # the same function is something like this:
+        #
+        #   class C(object):
+        #       def __getstate__(self):
+        #           return ...
+        #       __getnewargs__ = __getstate__
+        #
+        # No tricks are needed to ignore __setstate__; it simply
+        # won't be called when we don't generate BUILD.
+        # Also note that when __getnewargs__ and __getstate__ are
+        # the same function, we don't do the default thing of
+        # looking for __dict__ and slots either -- it is assumed
+        # that __getnewargs__ returns all the state there is
+        # (which should be a safe assumption since __getstate__
+        # returns the *same* state).
+        if getstate and getstate == getnewargs:
+            return
+
         if getstate:
             try:
                 state = getstate()