Merge "Disable the std license check on third_party/dbus-spy"
diff --git a/README.chromium b/README.chromium
index 3bfa4ab..7b7e1a6 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,7 +1,7 @@
URL: http://vidner.net/martin/software/dbus-spy/dbus-spy-0.1.py
Version: Current as of Tue Jan 24 21:22:03 PST 2012
License: Creative Commons Atrribution 3.0 Unported (CC BY 3.0)
-License File: No LICENSE file is available since the source code does not contaiin one.
+License File: No LICENSE file is available since the source code does not contain one.
License URL: http://creativecommons.org/licenses/by/3.0/
diff --git a/dbus-spy.py b/dbus-spy.py
index d0ab20b..29edbb3 100755
--- a/dbus-spy.py
+++ b/dbus-spy.py
@@ -1,10 +1,15 @@
#! /usr/bin/python
# by: http://en.opensuse.org/User:Mvidner
# license: http://creativecommons.org/licenses/by/3.0/
-
+#
+# Portions Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Distributed under the Creative Commons CCPL-Attribution-3.0 License.
+#
+# original can be found at:
+# http://vidner.net/martin/software/dbus-spy/dbus-spy-0.1.py
# based on http://alban.apinc.org/blog/dbusmessagesboxpy/
-VERSION = "0.1"
+VERSION = "0.1-cros"
print "dbus-spy %s: monitor, recorder, chart generator" % VERSION
norpm = False
@@ -207,15 +212,13 @@
self.fname = fname
def start(self):
- self.f = open(self.fname, "w")
+ self.f = open(self.fname, "a")
# TODO comment inside f
- self.f.write("[\n")
def msgd_handler(self, msgd):
self.f.write(str(msgd)+",\n")
def stop(self):
- self.f.write("]\n")
self.f.close()
class Filter(Output):
@@ -327,7 +330,7 @@
self.out = out
try:
slurp = self.f.read()
- self.messages = eval(slurp) # TODO! protect from evil code
+ self.messages = eval("[%s]" % slurp) # TODO! protect from evil code
except Exception, e:
print e
self.messages = []
