Re: [PATCH 6/7] py3k: Add and use a mixin class that implements __str__

diff --git a/da/9aad2c5f5bad414f78619209c1694868087786 b/da/9aad2c5f5bad414f78619209c1694868087786
new file mode 100644 (file)
index 0000000..9e225f4
--- /dev/null
+++ b/da/9aad2c5f5bad414f78619209c1694868087786
@@ -0,0 +1,138 @@
+Return-Path: <tomi.ollila@nixu.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 75F85429E2F\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 04:26:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id wGL8r4Hsx7yz for <notmuch@notmuchmail.org>;\r
+       Wed, 14 Dec 2011 04:26:42 -0800 (PST)\r
+Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A3094429E26\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 04:26:42 -0800 (PST)\r
+Received: from pps.filterd (mail-gw3 [127.0.0.1])\r
+       by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id pBECNMmQ009797;\r
+       Wed, 14 Dec 2011 14:26:39 +0200\r
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])\r
+       by mail-gw3.nixu.fi with ESMTP id 114cs0t9he-1\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Wed, 14 Dec 2011 14:26:39 +0200\r
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])\r
+       by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id\r
+       pBECQdc1016564; Wed, 14 Dec 2011 14:26:39 +0200\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Justus Winter <4winter@informatik.uni-hamburg.de>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 6/7] py3k: Add and use a mixin class that implements\r
+       __str__\r
+In-Reply-To:\r
+ <1323860305-15802-7-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+       <1323860305-15802-7-git-send-email-4winter@informatik.uni-hamburg.de>\r
+User-Agent: Notmuch/0.10.2+93~g631d290 (http://notmuchmail.org) Emacs/23.3.1\r
+       (i686-pc-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 14 Dec 2011 14:26:38 +0200\r
+Message-ID: <yf6obvbs5j5.fsf@taco2.nixu.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110,\r
+ 1.0.211,      0.0.0000        definitions=2011-12-14_05:2011-12-14, 2011-12-14,\r
+       1970-01-01 signatures=0\r
+X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0\r
+       ipscore=0 suspectscore=0\r
+       phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0\r
+       reason=mlx\r
+       scancount=1 engine=6.0.2-1012030000 definitions=main-1112140075\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 14 Dec 2011 12:26:43 -0000\r
+\r
+On Wed, 14 Dec 2011 11:58:24 +0100, Justus Winter <4winter@informatik.uni-hamburg.de> wrote:\r
+> ---\r
+[ ... snip ... ]\r
+\r
+>  \r
+> -class Filenames(object):\r
+> +class Filenames(Python3StringMixIn):\r
+>      """Represents a list of filenames as returned by notmuch\r
+>  \r
+>      This object contains the Filenames iterator. The main function is\r
+> @@ -98,9 +98,6 @@ class Filenames(object):\r
+>  \r
+>          self._files = None\r
+>  \r
+> -    def __str__(self):\r
+> -        return unicode(self).encode('utf-8')\r
+> -\r
+>      def __unicode__(self):\r
+>          """Represent Filenames() as newline-separated list of full paths\r
+>  \r
+> diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py\r
+> index c52790c..2111b86 100644\r
+> --- a/bindings/python/notmuch/globals.py\r
+> +++ b/bindings/python/notmuch/globals.py\r
+> @@ -28,6 +28,16 @@ except:\r
+>      raise ImportError("Could not find shared 'notmuch' library.")\r
+>  \r
+>  \r
+> +if sys.version_info[0] == 2:\r
+> +    class Python3StringMixIn(object):\r
+> +        def __str__(self):\r
+> +            return unicode(self).encode('utf-8')\r
+> +else:\r
+> +    class Python3StringMixIn(object):\r
+> +        def __str__(self):\r
+> +            return self.__unicode__()\r
+> +\r
+> +\r
+\r
+[ ... snip ... ]\r
+\r
+> -class Threads(object):\r
+> +class Threads(Python3StringMixIn):\r
+>      """Represents a list of notmuch threads\r
+>  \r
+>      This object provides an iterator over a list of notmuch threads\r
+> @@ -393,7 +393,7 @@ class Thread(object):\r
+>          return Tags(tags_p, self)\r
+>  \r
+>      def __str__(self):\r
+> -        return unicode(self).encode('utf-8')\r
+> +        return self.__unicode__().encode('utf-8')\r
+>  \r
+>      def __unicode__(self):\r
+>          frm = "thread:%s %12s [%d/%d] %s; %s (%s)"\r
+\r
+Is this class special case ? in all other classes\r
+the __str__() function has been removed (using inherited\r
+function) ?\r
+\r
+> -- \r
+> 1.7.7.3\r
+\r
+Otherwise LGTM -- pretty simple and effective (all 7 patches).\r
+\r
+Tomi\r
+\r