Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 635DA429E34 for ; Wed, 14 Dec 2011 02:58:58 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nz0zWTEp2lTw for ; Wed, 14 Dec 2011 02:58:56 -0800 (PST) Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 3818C429E37 for ; Wed, 14 Dec 2011 02:58:55 -0800 (PST) Received: from mail.jade-hamburg.de (unknown [85.183.11.228]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.cryptobitch.de (Postfix) with ESMTPSA id BD4B450F615 for ; Wed, 14 Dec 2011 11:58:53 +0100 (CET) Received: by mail.jade-hamburg.de (Postfix, from userid 401) id 407B0DF2A1; Wed, 14 Dec 2011 11:58:53 +0100 (CET) Received: from thinkbox.jade-hamburg.de (unknown [85.183.11.228]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: teythoon) by mail.jade-hamburg.de (Postfix) with ESMTPSA id AA7D8DF2A2; Wed, 14 Dec 2011 11:58:47 +0100 (CET) Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) (envelope-from ) id 1RamXr-0004MY-KH; Wed, 14 Dec 2011 11:58:43 +0100 From: Justus Winter <4winter@informatik.uni-hamburg.de> To: notmuch@notmuchmail.org Subject: [PATCH 3/7] py3k: All strings are unicode strings in py3k Date: Wed, 14 Dec 2011 11:58:21 +0100 Message-Id: <1323860305-15802-4-git-send-email-4winter@informatik.uni-hamburg.de> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de> References: <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Dec 2011 10:58:58 -0000 --- bindings/python/notmuch/globals.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py index 54a49b2..99e6a10 100644 --- a/bindings/python/notmuch/globals.py +++ b/bindings/python/notmuch/globals.py @@ -51,7 +51,7 @@ class Status(Enum): """Get a (unicode) string representation of a notmuch_status_t value.""" # define strings for custom error messages if status == STATUS.NOT_INITIALIZED: - return u"Operation on uninitialized object impossible." + return "Operation on uninitialized object impossible." return unicode(Status._status2str(status)) STATUS = Status(['SUCCESS', @@ -142,7 +142,7 @@ class NotmuchError(Exception): elif self.status is not None: return STATUS.status2str(self.status) else: - return u'Unknown error' + return 'Unknown error' # List of Subclassed exceptions that correspond to STATUS values and are -- 1.7.7.3