From 00ed0ad9e399a6ac694fd82d236ef99e268b5033 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 8 Jan 2012 22:04:44 +0000 Subject: [PATCH] Re: [PATCH 5/7] py3k: the basestring and unicode types are removed in python 3 --- cd/4d0070972844bb03b8a4973eb85c00b1009dd5 | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 cd/4d0070972844bb03b8a4973eb85c00b1009dd5 diff --git a/cd/4d0070972844bb03b8a4973eb85c00b1009dd5 b/cd/4d0070972844bb03b8a4973eb85c00b1009dd5 new file mode 100644 index 000000000..f0b8fe837 --- /dev/null +++ b/cd/4d0070972844bb03b8a4973eb85c00b1009dd5 @@ -0,0 +1,94 @@ +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 92C7440F45E + for ; Sun, 8 Jan 2012 06:04:55 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "Date" +X-Spam-Flag: NO +X-Spam-Score: 0.433 +X-Spam-Level: +X-Spam-Status: No, score=0.433 tagged_above=-999 required=5 + tests=[INVALID_DATE=0.432, UNPARSEABLE_RELAY=0.001] 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 Q669vVk8Tfcn for ; + Sun, 8 Jan 2012 06:04:55 -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 E178640F45B + for ; Sun, 8 Jan 2012 06:04:54 -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 D7C5535A01E + for ; Sun, 8 Jan 2012 15:04:52 +0100 (CET) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id 3356CDF2A2; Sun, 8 Jan 2012 15:04:52 +0100 (CET) +Received: from thinkbox.jade-hamburg.de (unknown + [IPv6:fe80::216:d3ff:fe3e:5058%br0]) + (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 78645DF2A0; + Sun, 8 Jan 2012 15:04:46 +0100 (CET) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1RjtMa-0007sn-BK; Sun, 08 Jan 2012 15:04:44 +0100 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: quoted-printable +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: Tomi Ollila , Sebastian Spaeth , + notmuch@notmuchmail.org +References: + <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de> + <1323860305-15802-6-git-send-email-4winter@informatik.uni-hamburg.de> + <87hb0ekudt.fsf@SSpaeth.de> +In-Reply-To: +Date: Sun, 08 Jan 2012 14:04:44 -0000 +Message-ID: <20120108140444.26863.68188@thinkbox.jade-hamburg.de> +Subject: Re: [PATCH 5/7] py3k: the basestring and unicode types are removed in + python 3 +Date: Sun, 08 Jan 2012 15:04:44 +0100 +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: Sun, 08 Jan 2012 14:04:55 -0000 + +Hi Tomi, Hi Sebastian :) + +Quoting Tomi Ollila (2012-01-04 19:07:11) +>On Mon, 02 Jan 2012 16:15:58 +0100, Sebastian Spaeth wrote: +>> Happy new year. Pushed patches 1-4 of this series so far. Looking fine, + +nice, thanks. + +>> but ugh, the below seems like a rather ugly hack in a function that is +>> probably called quite often. +>> +>> Isn't there a more pretty variant avoiding these sys.version_info checks +>> all over the place? + +Well, I rebased and updated this patch. There are now two different +implementations of _str like there are two Python3StringMixIn +classes. I'll send this patch as reply to this message. + +>Does the Python3StringMixIn stuff in later patches already handle this +>patch -- and making this obsolete ? + +No, that only handles the __str__ and __unicode__ stuff. + +Cheers, +Justus -- 2.26.2