Merge branch 'interpreter-api' into dev

Conflicts:
	jedi/__init__.py
	test/test_regression.py

See: #145
This commit is contained in:
Takafumi Arakaki
2013-05-18 22:28:56 +02:00
8 changed files with 328 additions and 28 deletions

View File

@@ -266,6 +266,7 @@ todo_include_todos = False
# -- Options for autodoc module ------------------------------------------------
autoclass_content = 'both'
autodoc_member_order = 'bysource'
autodoc_default_flags = []
#autodoc_default_flags = ['members', 'undoc-members']