Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Bug 752958 - Don't assume self.messages is a str

  • Loading branch information...
commit f8dc99ed5f22551ac5205668e849a732ab743b27 1 parent 33d07c5
Jonathan Griffin jonallengriffin authored

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. +2 2 marionette/errors.py
4 marionette/errors.py
@@ -44,10 +44,10 @@ def __init__(self, message=None, status=500, stacktrace=None):
44 44
45 45 def __str__(self):
46 46 if self.stacktrace:
47   - return '%s\nstacktrace:\n%s' % (self.message,
  47 + return '%s\nstacktrace:\n%s' % (str(self.message),
48 48 ''.join(['\t%s\n' % x for x in self.stacktrace.split('\n')]))
49 49 else:
50   - return self.message
  50 + return str(self.message)
51 51
52 52 class TimeoutException(MarionetteException):
53 53 pass

0 comments on commit f8dc99e

Please sign in to comment.
Something went wrong with that request. Please try again.