X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=inline;f=bindings%2Fpython%2Fnotmuch%2Fglobals.py;h=70cfdc3d12f5d3d7b6e6a84208ec7c133926afa3;hb=36bf31658c2ab8ff326d9c6008f97038c1b1f70c;hp=f5fad72aa4edf638f98b2508e0bce501fd2a9e55;hpb=7bf5be75ae8e3c2d4e8c06bba8b44f4fd495349b;p=notmuch
diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py
index f5fad72a..70cfdc3d 100644
--- a/bindings/python/notmuch/globals.py
+++ b/bindings/python/notmuch/globals.py
@@ -16,48 +16,22 @@ along with notmuch. If not, see .
Copyright 2010 Sebastian Spaeth
"""
-import sys
+
from ctypes import CDLL, Structure, POINTER
+from notmuch.version import SOVERSION
#-----------------------------------------------------------------------------
#package-global instance of the notmuch library
try:
- nmlib = CDLL("libnotmuch.so.3")
+ from os import uname
+ if uname()[0] == 'Darwin':
+ nmlib = CDLL("libnotmuch.{0:s}.dylib".format(SOVERSION))
+ else:
+ nmlib = CDLL("libnotmuch.so.{0:s}".format(SOVERSION))
except:
raise ImportError("Could not find shared 'notmuch' library.")
-
-if sys.version_info[0] == 2:
- class Python3StringMixIn(object):
- def __str__(self):
- return unicode(self).encode('utf-8')
-
-
- def _str(value):
- """Ensure a nicely utf-8 encoded string to pass to libnotmuch
-
- C++ code expects strings to be well formatted and
- unicode strings to have no null bytes."""
- if not isinstance(value, basestring):
- raise TypeError("Expected str or unicode, got %s" % type(value))
- if isinstance(value, unicode):
- return value.encode('UTF-8')
- return value
-else:
- class Python3StringMixIn(object):
- def __str__(self):
- return self.__unicode__()
-
-
- def _str(value):
- """Ensure a nicely utf-8 encoded string to pass to libnotmuch
-
- C++ code expects strings to be well formatted and
- unicode strings to have no null bytes."""
- if not isinstance(value, str):
- raise TypeError("Expected str, got %s" % type(value))
- return value.encode('UTF-8')
-
+from .compat import Python3StringMixIn, encode_utf8 as _str
class Enum(object):
"""Provides ENUMS as "code=Enum(['a','b','c'])" where code.a=0 etc..."""