fix [#26757] Python console: help() doesn't work anymore

also quiet some warnings & add docstrings to bpy module which was shaowing the GPL header in its help() message.

3 files changed, 20 insertions, 16 deletions

diff --git a/release/scripts/modules/bpy/__init__.py b/release/scripts/modules/bpy/__init__.py
index ed7b4baa806..1df8e9e5588 100644
--- a/release/scripts/modules/bpy/__init__.py
+++ b/release/scripts/modules/bpy/__init__.py
@@ -18,6 +18,10 @@
 
 # <pep8 compliant>
 
+"""
+Give access to blender data and utility functions.
+"""
+
 # internal blender C module
 import _bpy
 from _bpy import types, props, app
diff --git a/release/scripts/modules/console_python.py b/release/scripts/modules/console_python.py
index c25103e740c..274faac9f33 100644
--- a/release/scripts/modules/console_python.py
+++ b/release/scripts/modules/console_python.py
@@ -34,7 +34,7 @@ def add_scrollback(text, text_type):
 
 
 def replace_help(namespace):
-    def _help(value):
+    def _help(*args):
         # because of how the console works. we need our own help() pager func.
         # replace the bold function because it adds crazy chars
         import pydoc
@@ -42,7 +42,7 @@ def replace_help(namespace):
         pydoc.Helper.getline = lambda self, prompt: None
         pydoc.TextDoc.use_bold = lambda self, text: text
 
-        help(value)
+        pydoc.help(*args)
 
     namespace["help"] = _help
 
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index 6940b2a3543..d8f0abfd7e2 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -82,25 +82,13 @@ static EnumPropertyItem space_pchan_items[] = {
 	{1, "LOCAL", 0, "Local Space", ""},
 	{0, NULL, 0, NULL, NULL}};
 
+#ifdef RNA_RUNTIME
+
 static EnumPropertyItem space_object_items[] = {
 	{0, "WORLD", 0, "World Space", ""},
 	{1, "LOCAL", 0, "Local Space", ""},
 	{0, NULL, 0, NULL, NULL}};
 
-static EnumPropertyItem constraint_ik_type_items[] ={
-	{CONSTRAINT_IK_COPYPOSE, "COPY_POSE", 0, "Copy Pose", ""},
-	{CONSTRAINT_IK_DISTANCE, "DISTANCE", 0, "Distance", ""},
-	{0, NULL, 0, NULL, NULL},
-};
-
-static EnumPropertyItem constraint_ik_axisref_items[] ={
-	{0, "BONE", 0, "Bone", ""},
-	{CONSTRAINT_IK_TARGETAXIS, "TARGET", 0, "Target", ""},
-	{0, NULL, 0, NULL, NULL},
-};
-
-#ifdef RNA_RUNTIME
-
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_constraint.h"
@@ -466,6 +454,18 @@ static void rna_def_constraint_kinematic(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
+	static EnumPropertyItem constraint_ik_axisref_items[] ={
+		{0, "BONE", 0, "Bone", ""},
+		{CONSTRAINT_IK_TARGETAXIS, "TARGET", 0, "Target", ""},
+		{0, NULL, 0, NULL, NULL},
+	};
+
+	static EnumPropertyItem constraint_ik_type_items[] ={
+		{CONSTRAINT_IK_COPYPOSE, "COPY_POSE", 0, "Copy Pose", ""},
+		{CONSTRAINT_IK_DISTANCE, "DISTANCE", 0, "Distance", ""},
+		{0, NULL, 0, NULL, NULL},
+	};
+
 	srna= RNA_def_struct(brna, "KinematicConstraint", "Constraint");
 	RNA_def_struct_ui_text(srna, "Kinematic Constraint", "Inverse Kinematics");
 	RNA_def_struct_sdna_from(srna, "bKinematicConstraint", "data");