1 Return-Path: <tomi.ollila@nixu.com>
\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 7F88C429E37
\r
6 for <notmuch@notmuchmail.org>; Wed, 4 Jan 2012 10:07:25 -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 WuBoHRh-rV7f for <notmuch@notmuchmail.org>;
\r
16 Wed, 4 Jan 2012 10:07:24 -0800 (PST)
\r
17 Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 99C41429E21
\r
21 for <notmuch@notmuchmail.org>; Wed, 4 Jan 2012 10:07:24 -0800 (PST)
\r
22 Received: from pps.filterd (mail-gw3 [127.0.0.1])
\r
23 by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id q04I5k5X015721;
\r
24 Wed, 4 Jan 2012 20:07:12 +0200
\r
25 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
26 by mail-gw3.nixu.fi with ESMTP id 114cs0xcej-1
\r
27 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
28 Wed, 04 Jan 2012 20:07:12 +0200
\r
29 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
30 by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
\r
31 q04I7BeO008541; Wed, 4 Jan 2012 20:07:11 +0200
\r
32 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
33 To: Sebastian Spaeth <Sebastian@SSpaeth.de>,
\r
34 Justus Winter <4winter@informatik.uni-hamburg.de>, notmuch@notmuchmail.org
\r
35 Subject: Re: [PATCH 5/7] py3k: the basestring and unicode types are removed in
\r
37 In-Reply-To: <87hb0ekudt.fsf@SSpaeth.de>
\r
39 <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
40 <1323860305-15802-6-git-send-email-4winter@informatik.uni-hamburg.de>
\r
41 <87hb0ekudt.fsf@SSpaeth.de>
\r
42 User-Agent: Notmuch/0.10.2+157~g442d405 (http://notmuchmail.org) Emacs/23.3.1
\r
44 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
45 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
46 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
47 Date: Wed, 04 Jan 2012 20:07:11 +0200
\r
48 Message-ID: <yf6sjjvxrxs.fsf@taco2.nixu.fi>
\r
50 Content-Type: text/plain; charset=us-ascii
\r
51 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110,
\r
52 1.0.211, 0.0.0000 definitions=2012-01-04_07:2012-01-04, 2012-01-04,
\r
53 1970-01-01 signatures=0
\r
54 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
\r
55 ipscore=0 suspectscore=0
\r
56 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0
\r
58 scancount=1 engine=6.0.2-1012030000 definitions=main-1201040166
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Wed, 04 Jan 2012 18:07:25 -0000
\r
73 On Mon, 02 Jan 2012 16:15:58 +0100, Sebastian Spaeth <Sebastian@SSpaeth.de> wrote:
\r
74 > Happy new year. Pushed patches 1-4 of this series so far. Looking fine,
\r
75 > but ugh, the below seems like a rather ugly hack in a function that is
\r
76 > probably called quite often.
\r
78 > Isn't there a more pretty variant avoiding these sys.version_info checks
\r
79 > all over the place?
\r
81 > > @@ -200,9 +201,9 @@ def _str(value):
\r
83 > > C++ code expects strings to be well formatted and
\r
84 > > unicode strings to have no null bytes."""
\r
85 > > - if not isinstance(value, basestring):
\r
86 > > + if not isinstance(value, basestring if sys.version_info[0] == 2 else str):
\r
87 > > raise TypeError("Expected str or unicode, got %s" % str(type(value)))
\r
88 > > - if isinstance(value, unicode):
\r
89 > > + if sys.version_info[0] == 3 or isinstance(value, unicode):
\r
90 > > return value.encode('UTF-8')
\r
93 Does the Python3StringMixIn stuff in later patches already handle this
\r
94 patch -- and making this obsolete ?
\r