Merge branch 'master' of github.com:inducer/pudb

inducer · Oct 29, 2017 · 5ffbd1a · 5ffbd1a
2 parents 54fca02 + e7b1d9d
commit 5ffbd1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pudb/debugger.py b/pudb/debugger.py
@@ -409,10 +409,8 @@ def user_line(self, frame):
 
     def user_return(self, frame, return_value):
         """This function is called when a return trap is set here."""
-        if frame.f_code.co_name == '<module>':
-            return
-
-        frame.f_locals['__return__'] = return_value
+        if frame.f_code.co_name != '<module>':
+            frame.f_locals['__return__'] = return_value
 
         if self._wait_for_mainpyfile:
             if (self.mainpyfile != self.canonic(frame.f_code.co_filename)

diff --git a/pudb/var_view.py b/pudb/var_view.py
@@ -259,7 +259,7 @@ def type_stringifier(value):
         except Exception:
             pass
 
-    elif hasattr(value, "safely_stringify_for_pudb"):
+    elif hasattr(type(value), "safely_stringify_for_pudb"):
         try:
             # (E.g.) Mock objects will pretend to have this
             # and return nonsense.