Ensure that the results of __str__ and __repr__ are strings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bbf07386b3
commit
bbdcf8c200
@ -860,12 +860,13 @@ public:
|
|||||||
%pythoncode {
|
%pythoncode {
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
if self.IsValid():
|
if self.IsValid():
|
||||||
return '<wx.DateTime: \"%s\" at %s>' % ( self.Format(), self.this)
|
f = self.Format().encode(wx.GetDefaultPyEncoding())
|
||||||
|
return '<wx.DateTime: \"%s\" at %s>' % ( f, self.this)
|
||||||
else:
|
else:
|
||||||
return '<wx.DateTime: \"INVALID\" at %s>' % self.this
|
return '<wx.DateTime: \"INVALID\" at %s>' % self.this
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if self.IsValid():
|
if self.IsValid():
|
||||||
return self.Format()
|
return self.Format().encode(wx.GetDefaultPyEncoding())
|
||||||
else:
|
else:
|
||||||
return "INVALID DateTime"
|
return "INVALID DateTime"
|
||||||
}
|
}
|
||||||
@ -1011,9 +1012,10 @@ public:
|
|||||||
|
|
||||||
%pythoncode {
|
%pythoncode {
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return '<wx.TimeSpan: \"%s\" at %s>' % ( self.Format(), self.this)
|
f = self.Format().encode(wx.GetDefaultPyEncoding())
|
||||||
|
return '<wx.TimeSpan: \"%s\" at %s>' % ( f, self.this)
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.Format()
|
return self.Format().encode(wx.GetDefaultPyEncoding())
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user