Jean-Louis Fuchs
|
34e89fa1c5
|
Merge branch 'dev' into get_code_fidelity
Conflicts:
jedi/evaluate/docstrings.py
jedi/parser/representation.py
Resolving merge problems:
* Introducing docstring for compiled.fake
* Partly fixing poor decision in TokenDocstring __init__
|
2014-01-28 00:37:06 +01:00 |
|
Dave Halter
|
cd40e213ce
|
Remove UserContextParser again from docstring stuff, not really needed there. use a simpler solution
|
2014-01-17 03:06:07 +01:00 |
|
Dave Halter
|
19b0e1d5b6
|
reenable check_user_statement in parser, that did the whole user names calculation
|
2014-01-17 02:48:00 +01:00 |
|
Dave Halter
|
b30a186f8f
|
remove user_stmt and user_scope stuff - yes!
|
2014-01-17 02:34:09 +01:00 |
|
Dave Halter
|
39c16237da
|
remove a circular dependency for docstrings.
|
2014-01-05 14:45:01 +01:00 |
|
Dave Halter
|
fbfab9eefb
|
moved docstrings module to evaluate
|
2014-01-05 14:40:21 +01:00 |
|