Remove unnecessary patch from Python 3

ref:08457aac212d00dad336d739a11d619cf2882ae3

2 files changed, 6 insertions, 6 deletions

diff --git a/contrib/tools/python3/src/Lib/inspect.py b/contrib/tools/python3/src/Lib/inspect.py
index dd00c21fc2..6f91435541 100644
--- a/contrib/tools/python3/src/Lib/inspect.py
+++ b/contrib/tools/python3/src/Lib/inspect.py
@@ -655,13 +655,13 @@ def cleandoc(doc):
 def getfile(object):
     """Work out which source or compiled file an object was defined in."""
     if ismodule(object):
-        if getattr(object, '__file__', None) is not None:
+        if getattr(object, '__file__', None):
             return object.__file__
         raise TypeError('{!r} is a built-in module'.format(object))
     if isclass(object):
         if hasattr(object, '__module__'):
             module = sys.modules.get(object.__module__)
-            if getattr(module, '__file__', None) is not None:
+            if getattr(module, '__file__', None):
                 return module.__file__
         raise TypeError('{!r} is a built-in class'.format(object))
     if ismethod(object):
diff --git a/library/python/pytest/plugins/conftests.py b/library/python/pytest/plugins/conftests.py
index 522041f5a7..3c855c9c11 100644
--- a/library/python/pytest/plugins/conftests.py
+++ b/library/python/pytest/plugins/conftests.py
@@ -11,10 +11,10 @@ orig_getfile = inspect.getfile
 
 
 def getfile(object):
-    res = orig_getfile(object)
-    if inspect.ismodule(object):
-        if not res and getattr(object, '__orig_file__'):
-            res = object.__orig_file__
+    if inspect.ismodule(object) and getattr(object, '__orig_file__', None):
+        res = object.__orig_file__
+    else:
+        res = orig_getfile(object)
     return res
 
 inspect.getfile = getfile