Commit 56eb3cbc authored by Elizaveta Shashkova's avatar Elizaveta Shashkova Committed by Andrey Vlasovskikh
Browse files

Updates from PyDev: Kill some code by providing default for 'use_value_repr_instead_of_str'

(cherry picked from commit a27a0f69)
parent bd5333c6
Showing with 10 additions and 17 deletions
+10 -17
......@@ -66,7 +66,6 @@ class DefaultResolver:
'''
DefaultResolver is the class that'll actually resolve how to show some variable.
'''
use_value_repr_instead_of_str = False
def resolve(self, var, attribute):
return getattr(var, attribute)
......@@ -190,7 +189,6 @@ class DefaultResolver:
# DictResolver
#=======================================================================================================================
class DictResolver:
use_value_repr_instead_of_str = False
def resolve(self, dict, key):
if key in ('__len__', TOO_LARGE_ATTR):
......@@ -249,7 +247,6 @@ class DictResolver:
# TupleResolver
#=======================================================================================================================
class TupleResolver: #to enumerate tuples and lists
use_value_repr_instead_of_str = False
def resolve(self, var, attribute):
'''
......@@ -293,7 +290,6 @@ class SetResolver:
'''
Resolves a set as dict id(object)->object
'''
use_value_repr_instead_of_str = False
def resolve(self, var, attribute):
if attribute in ('__len__', TOO_LARGE_ATTR):
......@@ -333,7 +329,6 @@ class SetResolver:
# InstanceResolver
#=======================================================================================================================
class InstanceResolver:
use_value_repr_instead_of_str = False
def resolve(self, var, attribute):
field = var.__class__.getDeclaredField(attribute)
......@@ -362,7 +357,6 @@ class JyArrayResolver:
'''
This resolves a regular Object[] array from java
'''
use_value_repr_instead_of_str = False
def resolve(self, var, attribute):
if attribute == '__len__':
......@@ -385,7 +379,6 @@ class JyArrayResolver:
# MultiValueDictResolver
#=======================================================================================================================
class MultiValueDictResolver(DictResolver):
use_value_repr_instead_of_str = False
def resolve(self, dict, key):
if key in ('__len__', TOO_LARGE_ATTR):
......@@ -408,7 +401,6 @@ class MultiValueDictResolver(DictResolver):
#=======================================================================================================================
class DjangoFormResolver(DefaultResolver):
has_errors_attr = False
use_value_repr_instead_of_str = True
def get_names(self, var):
names = dir(var)
......@@ -436,7 +428,6 @@ class DjangoFormResolver(DefaultResolver):
# DequeResolver
#=======================================================================================================================
class DequeResolver(TupleResolver):
use_value_repr_instead_of_str = False
def get_dictionary(self, var):
d = TupleResolver.get_dictionary(self, var)
d['maxlen'] = getattr(var, 'maxlen', None)
......@@ -458,7 +449,6 @@ class FrameResolver:
'''
This resolves a frame.
'''
use_value_repr_instead_of_str = False
def resolve(self, obj, attribute):
if attribute == '__internals__':
......
from _pydevd_bundle.pydevd_extension_api import TypeResolveProvider
from _pydevd_bundle.pydevd_resolver import defaultResolver, MAX_ITEMS_TO_HANDLE, TOO_LARGE_ATTR, TOO_LARGE_MSG
from .helpers import find_mod_attr
#=======================================================================================================================
# =======================================================================================================================
# NdArrayResolver
#=======================================================================================================================
# =======================================================================================================================
class NdArrayResolver: pass
class NdArrayItemsContainer: pass
......@@ -17,7 +20,6 @@ class NDArrayTypeResolveProvider(object):
'''
This resolves a numpy ndarray returning some metadata about the NDArray
'''
use_value_repr_instead_of_str = False
def is_numeric(self, obj):
if not hasattr(obj, 'dtype'):
......@@ -75,6 +77,8 @@ class NDArrayTypeResolveProvider(object):
ret['[0:%s] ' % (len(obj))] = list(obj[0:MAX_ITEMS_TO_HANDLE])
return ret
import sys
if not sys.platform.startswith("java"):
TypeResolveProvider.register(NDArrayTypeResolveProvider)
from _pydevd_bundle.pydevd_extension_api import StrPresentationProvider, TypeResolveProvider
class RectResolver(TypeResolveProvider):
use_value_repr_instead_of_str= False
def get_dictionary(self, var):
return {'length': var.length, 'width' : var.width, 'area': var.length * var.width}
return {'length': var.length, 'width': var.width, 'area': var.length * var.width}
def resolve(self, var, attribute):
return getattr(var, attribute, None) if attribute != 'area' else var.length * var.width
......@@ -13,6 +11,7 @@ class RectResolver(TypeResolveProvider):
def can_provide(self, type_object, type_name):
return type_name.endswith('Rect')
class RectToString(StrPresentationProvider):
def get_str(self, val):
return "Rectangle[Length: %s, Width: %s , Area: %s]" % (val.length, val.width, val.length * val.width)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment