From 4a6642a2a1e2d15f71fff6b6a0b4bbb0296e2bdb Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Wed, 14 Dec 2011 14:04:35 +0100 Subject: py3k: Add and use a mixin class that implements __str__ Amended by Sebastian Spaeth to include the required sys import in globals.py. --- bindings/python/notmuch/filename.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'bindings/python/notmuch/filename.py') diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filename.py index a7cd7e6..969931a 100644 --- a/bindings/python/notmuch/filename.py +++ b/bindings/python/notmuch/filename.py @@ -18,10 +18,10 @@ Copyright 2010 Sebastian Spaeth ' """ from ctypes import c_char_p from notmuch.globals import (nmlib, STATUS, NotmuchError, - NotmuchFilenamesP, NotmuchMessageP) + NotmuchFilenamesP, NotmuchMessageP, _str, Python3StringMixIn) -class Filenames(object): +class Filenames(Python3StringMixIn): """Represents a list of filenames as returned by notmuch This object contains the Filenames iterator. The main function is @@ -98,9 +98,6 @@ class Filenames(object): self._files = None - def __str__(self): - return unicode(self).encode('utf-8') - def __unicode__(self): """Represent Filenames() as newline-separated list of full paths -- cgit v1.2.3