Merge pull request #3346 from xonsh/superhelp

Fix superhelp

news/superhelp.rst

@@ -0,0 +1,24 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Fixed a regession with xonsh superhelp ``??`` operator and ``which -v`` which showed Pythons builtin
+  doc strings. 
+
+**Security:**
+
+* <news item>

xonsh/inspectors.py

@@ -33,9 +33,11 @@ _func_call_docstring = LazyObject(
 _object_init_docstring = LazyObject(
     lambda: object.__init__.__doc__, globals(), "_object_init_docstring"
 )
+
 _builtin_type_docstrings = LazyObject(
     lambda: {
-        t.__doc__ for t in (types.ModuleType, types.MethodType, types.FunctionType)
+        inspect.getdoc(t)
+        for t in (types.ModuleType, types.MethodType, types.FunctionType, property)
     },
     globals(),
     "_builtin_type_docstrings",

xonsh/xoreutils/which.py

@@ -104,7 +104,11 @@ def print_alias(arg, stdout, verbose=False):
         else:
             print(arg, file=stdout)
     else:
-        print("aliases['{}'] = {}".format(arg, builtins.aliases[arg]), file=stdout)
+        print(
+            "aliases['{}'] = {}".format(arg, builtins.aliases[arg]),
+            flush=True,
+            file=stdout,
+        )
         if callable(builtins.aliases[arg]):
             builtins.__xonsh__.superhelp(builtins.aliases[arg])