Making the Cocoa formatters comply with the new on-disk layout of the Python resources - This is one of the steps towards making the data formatters work again
llvm-svn: 155526
diff --git a/lldb/examples/summaries/cocoa/NSBundle.py b/lldb/examples/summaries/cocoa/NSBundle.py
index 6ad7cc3..7ef61d7 100644
--- a/lldb/examples/summaries/cocoa/NSBundle.py
+++ b/lldb/examples/summaries/cocoa/NSBundle.py
@@ -8,12 +8,12 @@
# summary provider for NSBundle
import lldb
import ctypes
-import objc_runtime
-import metrics
+import lldb.runtime.objc.objc_runtime
+import lldb.formatters.metrics
import NSURL
-import Logger
+import lldb.formatters.Logger
-statistics = metrics.Metrics()
+statistics = lldb.formatters.metrics.Metrics()
statistics.add_metric('invalid_isa')
statistics.add_metric('invalid_pointer')
statistics.add_metric('unknown_class')
@@ -27,7 +27,7 @@
pass
def __init__(self, valobj, params):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
self.valobj = valobj;
self.sys_params = params
if not(self.sys_params.types_cache.NSString):
@@ -35,18 +35,18 @@
self.update();
def update(self):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
self.adjust_for_architecture();
# we need to skip the ISA, plus four other values
# that are luckily each a pointer in size
# which makes our computation trivial :-)
def offset(self):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
return 5 * self.sys_params.pointer_size
def url_text(self):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
global statistics
text = self.valobj.CreateChildAtOffset("text",
self.offset(),
@@ -65,17 +65,17 @@
pass
def __init__(self, valobj, params):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
self.valobj = valobj;
self.sys_params = params
self.update()
def update(self):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
self.adjust_for_architecture();
def url_text(self):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
stream = lldb.SBStream()
self.valobj.GetExpressionPath(stream)
expr = "(NSString*)[" + stream.GetData() + " bundlePath]"
@@ -86,7 +86,7 @@
def GetSummary_Impl(valobj):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
global statistics
class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics)
if wrapper:
@@ -107,7 +107,7 @@
return wrapper;
def NSBundle_SummaryProvider (valobj,dict):
- logger = Logger.Logger()
+ logger = lldb.formatters.Logger.Logger()
provider = GetSummary_Impl(valobj);
if provider != None:
if isinstance(provider,objc_runtime.SpecialSituation_Description):