Autopilot

Merge lp:~chris.gagnon/autopilot/lp1185991 into lp:autopilot

  1. lp1185991
  2. Merge into trunk
Proposed by Chris Gagnon
Status: Merged
Approved by: Thomi Richards
Approved revision: 233
Merged at revision: 232
Proposed branch: lp:~chris.gagnon/autopilot/lp1185991
Merge into: lp:autopilot
Diff against target: 26 lines (+3/-2)
2 files modified
autopilot/vis/objectproperties.py (+2/-1)
autopilot/vis/resources.py (+1/-1)
To merge this branch: bzr merge lp:~chris.gagnon/autopilot/lp1185991
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomi Richards (community) Approve
Review via email: mp+166598@code.launchpad.net

Commit message

make autopilot vis use utf8 instead of ascii

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/autopilot-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/42

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/114/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/vis/objectproperties.py'
2--- autopilot/vis/objectproperties.py 2013-04-23 04:15:54 +0000
3+++ autopilot/vis/objectproperties.py 2013-05-30 20:44:30 +0000
4@@ -118,7 +118,8 @@
5 for i, key in enumerate(object_details):
6 details_string = dbus_string_rep(object_details[key])
7 item_name = QtGui.QTableWidgetItem(key)
8- item_details = QtGui.QTableWidgetItem(details_string)
9+ item_details = QtGui.QTableWidgetItem(
10+ details_string.decode('utf-8'))
11 self.table_view.setItem(i, 0, item_name)
12 self.table_view.setItem(i, 1, item_details)
13 self.table_view.setSortingEnabled(True)
14
15=== modified file 'autopilot/vis/resources.py'
16--- autopilot/vis/resources.py 2013-04-23 04:15:54 +0000
17+++ autopilot/vis/resources.py 2013-05-30 20:44:30 +0000
18@@ -32,7 +32,7 @@
19 if isinstance(dbus_type, dbus.Boolean):
20 return repr(bool(dbus_type))
21 if isinstance(dbus_type, dbus.String):
22- return dbus_type.encode('ascii', errors='ignore')
23+ return dbus_type.encode('utf-8', errors='ignore')
24 if (isinstance(dbus_type, dbus.Int16)
25 or isinstance(dbus_type, dbus.UInt16)
26 or isinstance(dbus_type, dbus.Int32)

Subscribers

People subscribed via source and target branches