[PATCH 5/7] py3k: the basestring and unicode types are removed in python 3

diff --git a/4c/30f1e2baace4fa8ea6215abb590653c8f5220a b/4c/30f1e2baace4fa8ea6215abb590653c8f5220a
new file mode 100644 (file)
index 0000000..052a6fe
--- /dev/null
+++ b/4c/30f1e2baace4fa8ea6215abb590653c8f5220a
@@ -0,0 +1,93 @@
+Return-Path: <teythoon@jade-hamburg.de>\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 341E9429E34\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 02:59:00 -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 myKyHXrKY+yO for <notmuch@notmuchmail.org>;\r
+       Wed, 14 Dec 2011 02:58:59 -0800 (PST)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CF328429E35\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 02:58:58 -0800 (PST)\r
+Received: from mail.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 804EB50F615\r
+       for <notmuch@notmuchmail.org>; Wed, 14 Dec 2011 11:58:57 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 00B94DF2A1; Wed, 14 Dec 2011 11:58:56 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id 10B30DF2A4;\r
+       Wed, 14 Dec 2011 11:58:48 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1RamXr-0004Me-Ts; Wed, 14 Dec 2011 11:58:43 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/7] py3k: the basestring and unicode types are removed in\r
+       python 3\r
+Date: Wed, 14 Dec 2011 11:58:23 +0100\r
+Message-Id:\r
+ <1323860305-15802-6-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To:\r
+ <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1323860305-15802-1-git-send-email-4winter@informatik.uni-hamburg.de>\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 10:59:00 -0000\r
+\r
+---\r
+ bindings/python/notmuch/globals.py |    5 +++--\r
+ 1 files changed, 3 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py\r
+index 99e6a10..c52790c 100644\r
+--- a/bindings/python/notmuch/globals.py\r
++++ b/bindings/python/notmuch/globals.py\r
+@@ -17,6 +17,7 @@ along with notmuch.  If not, see <http://www.gnu.org/licenses/>.\r
+ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'\r
+ """\r
+ \r
++import sys\r
+ from ctypes import CDLL, c_char_p, c_int, Structure, POINTER\r
+ \r
+ #-----------------------------------------------------------------------------\r
+@@ -200,9 +201,9 @@ def _str(value):\r
+ \r
+     C++ code expects strings to be well formatted and\r
+     unicode strings to have no null bytes."""\r
+-    if not isinstance(value, basestring):\r
++    if not isinstance(value, basestring if sys.version_info[0] == 2 else str):\r
+         raise TypeError("Expected str or unicode, got %s" % str(type(value)))\r
+-    if isinstance(value, unicode):\r
++    if sys.version_info[0] == 3 or isinstance(value, unicode):\r
+         return value.encode('UTF-8')\r
+     return value\r
+ \r
+-- \r
+1.7.7.3\r
+\r