1 Return-Path: <teythoon@jade-hamburg.de>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 341E9429E34
\r
6 for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 02:59:00 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id myKyHXrKY+yO for <notmuch@notmuchmail.org>;
\r
16 Wed, 14 Dec 2011 02:58:59 -0800 (PST)
\r
17 Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])
\r
18 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id CF328429E35
\r
21 for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 02:58:58 -0800 (PST)
\r
22 Received: from mail.jade-hamburg.de (unknown [85.183.11.228])
\r
23 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
24 (No client certificate requested)
\r
25 by mail.cryptobitch.de (Postfix) with ESMTPSA id 804EB50F615
\r
26 for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 11:58:57 +0100 (CET)
\r
27 Received: by mail.jade-hamburg.de (Postfix, from userid 401)
\r
28 id 00B94DF2A1; Wed, 14 Dec 2011 11:58:56 +0100 (CET)
\r
29 Received: from thinkbox.jade-hamburg.de (unknown [85.183.11.228])
\r
30 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
31 (No client certificate requested) (Authenticated sender: teythoon)
\r
32 by mail.jade-hamburg.de (Postfix) with ESMTPSA id 10B30DF2A4;
\r
33 Wed, 14 Dec 2011 11:58:48 +0100 (CET)
\r
34 Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)
\r
35 (envelope-from <teythoon@thinkbox.jade-hamburg.de>)
\r
36 id 1RamXr-0004Me-Ts; Wed, 14 Dec 2011 11:58:43 +0100
\r
37 From: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 5/7] py3k: the basestring and unicode types are removed in
\r
41 Date: Wed, 14 Dec 2011 11:58:23 +0100
\r
43 <1323860305-15802-6-git-send-email-4winter@informatik.uni-hamburg.de>
\r
44 X-Mailer: git-send-email 1.7.7.3
\r
46 <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
48 <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Wed, 14 Dec 2011 10:59:00 -0000
\r
64 bindings/python/notmuch/globals.py | 5 +++--
\r
65 1 files changed, 3 insertions(+), 2 deletions(-)
\r
67 diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py
\r
68 index 99e6a10..c52790c 100644
\r
69 --- a/bindings/python/notmuch/globals.py
\r
70 +++ b/bindings/python/notmuch/globals.py
\r
71 @@ -17,6 +17,7 @@ along with notmuch. If not, see <http://www.gnu.org/licenses/>.
\r
72 Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
\r
76 from ctypes import CDLL, c_char_p, c_int, Structure, POINTER
\r
78 #-----------------------------------------------------------------------------
\r
79 @@ -200,9 +201,9 @@ def _str(value):
\r
81 C++ code expects strings to be well formatted and
\r
82 unicode strings to have no null bytes."""
\r
83 - if not isinstance(value, basestring):
\r
84 + if not isinstance(value, basestring if sys.version_info[0] == 2 else str):
\r
85 raise TypeError("Expected str or unicode, got %s" % str(type(value)))
\r
86 - if isinstance(value, unicode):
\r
87 + if sys.version_info[0] == 3 or isinstance(value, unicode):
\r
88 return value.encode('UTF-8')
\r