Merge remote-tracking branch 'origin/master' into numpy-array-view

Conflicts:
	python/helpers/pydev/pydevd_vars.py
	python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java

diff --combined python/helpers/pydev/pydevd_vars.py
index 2922dc2fe33fa4181e0d079936362167f2b913c1,e1aa436b8946e93a50ac1f0bb7bd94ddc3150bc4..1dc9790b40a642cd820366121a73647a2cde43a2
--- 1/python/helpers/pydev/pydevd_vars.py
--- 2/python/helpers/pydev/pydevd_vars.py
+++ b/python/helpers/pydev/pydevd_vars.py
@@@ -2,7 -2,6 +2,7 @@@
      resolution/conversion to XML.
  """
  import pickle
 +from django_frame import DjangoTemplateFrame
  from pydevd_constants import * #@UnusedWildImport
  from types import * #@UnusedWildImport
  
@@@ -360,10 -359,10 +360,10 @@@ def changeAttrExpression(thread_id, fra
      try:
          expression = expression.replace('@LINE@', '\n')
  
-         if isinstance(frame, DjangoTemplateFrame):
-             result = eval(expression, frame.f_globals, frame.f_locals)
-             frame.changeVariable(attr, result)
-             return result
+         # if isinstance(frame, DjangoTemplateFrame): # TODO: implemente for plugins
+         #     result = eval(expression, frame.f_globals, frame.f_locals)
+         #     frame.changeVariable(attr, result)
+         #     return result
  
          if attr[:7] == "Globals":
              attr = attr[8:]

diff --combined python/src/META-INF/python-core.xml
index 1d10206886a90767497de820d0a06a9d46bf61d4,5091d43386a112c885a2ddc87a308c639fa28351..f82093b19d0dc7fd3746a89300142931cb9105af
--- 1/python/src/META-INF/python-core.xml
--- 2/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@@ -477,9 -477,6 +477,6 @@@
      <projectService serviceInterface="com.jetbrains.python.debugger.PySignatureCacheManager"
                      serviceImplementation="com.jetbrains.python.debugger.PySignatureCacheManagerImpl"/>
  
-     <projectService serviceInterface="com.jetbrains.python.hierarchy.call.PyStaticCallDataManager"
-                     serviceImplementation="com.jetbrains.python.hierarchy.call.PyStaticCallDataManagerImpl"/>
- 
      <projectService serviceInterface="com.jetbrains.python.psi.PyPsiFacade"
                      serviceImplementation="com.jetbrains.python.psi.impl.PyPsiFacadeImpl"/>
      <applicationService serviceInterface="com.jetbrains.python.packaging.PyPackageManagers"
@@@ -721,11 -718,6 +718,11 @@@
      <action id="PyInvertBooleanAction" class="com.jetbrains.python.refactoring.invertBoolean.PyInvertBooleanAction" text="Invert Boolean">
        <add-to-group group-id="RefactoringMenu" anchor="last" />
      </action>
 +
 +    <action id="PyDebugger.ViewArray" class="com.jetbrains.python.actions.view.array.PyViewArrayAction">
 +      <add-to-group group-id="XDebugger.ValueGroup" anchor="after" relative-to-action="Debugger.Tree.AddToWatches"/>
 +    </action>
 +
    </actions>
  
    <extensions defaultExtensionNs="com.intellij.spellchecker">