Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-04-04 03:11:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-04 03:11:00 +0400
commit65b13c80898aee7679286f441735db87c2e62afa (patch)
treea178659d59a3b3b89be7c1e74cba2a12ebf5694e /release
parent9decca10e0e416a038f6e06566e9d3fd4705bf4f (diff)
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.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/bpy/__init__.py4
-rw-r--r--release/scripts/modules/console_python.py4
2 files changed, 6 insertions, 2 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