add python install & support Python 2.x

.gitignore

@@ -42,6 +42,8 @@ Linux/Makefile
 cmake-build-debug/
 cmake-build-release/
 build/
+dist/
+*.egg-info/
 
 #CLion
 .idea

POSIX/Python/demo.py

@@ -1,7 +1,8 @@
-#!/ usr / bin / env python
-# - * - coding : utf - 8 - * -
-import mmkv
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 import sys
+import mmkv
 
 
 def functional_test(decode_only):
@@ -41,7 +42,9 @@ def functional_test(decode_only):
         ls = range(0, 10)
         kv.set(bytes(ls), 'bytes')
     b = kv.getBytes('bytes')
-    print('raw bytes = ', b, ', decoded bytes = ', list(b))
+    print('raw bytes = ', b)
+    if sys.version_info >= (3, 0):
+        print('decoded bytes = ', list(b))
 
     if not decode_only:
         print('keys before remove:', sorted(kv.keys()))
@@ -54,11 +57,16 @@ def functional_test(decode_only):
 
 
 def logger(log_level, file, line, function, message):
-    level = {mmkv.MMKVLogLevel.NoLog : 'N', mmkv.MMKVLogLevel.Debug : 'D', mmkv.MMKVLogLevel.Info : 'I', mmkv.MMKVLogLevel.Warning : 'W', mmkv.MMKVLogLevel.Error : 'E'}
+    level = {mmkv.MMKVLogLevel.NoLog: 'N',
+             mmkv.MMKVLogLevel.Debug: 'D',
+             mmkv.MMKVLogLevel.Info: 'I',
+             mmkv.MMKVLogLevel.Warning: 'W',
+             mmkv.MMKVLogLevel.Error: 'E'}
     print('r-[{0}] <{1}:{2}:{3}> {4}'.format(level[log_level], file, line, function, message))
 
 
 def error_handler(mmap_id, error_type):
+    print('[{}] has error {}'.format(mmap_id, error_type))
     return mmkv.MMKVErrorType.OnErrorRecover
 
 
@@ -86,4 +94,3 @@ if __name__ == '__main__':
     # mmkv.MMKV.unRegisterErrorHandler()
     # mmkv.MMKV.unRegisterContentChangeHandler()
     mmkv.MMKV.onExit()
-

POSIX/Python/libmmkv_python.cpp

@@ -183,7 +183,7 @@ PYBIND11_MODULE(mmkv, m) {
             return defaultValue;
         },
         "decode an UTF-8 String/bytes value", py::arg("key"), py::arg("defaultValue") = string());
-#if PY_MAJOR_VERSION >= 3
+
     clsMMKV.def(
         "getBytes",
         [](MMKV &kv, const string &key, const py::bytes &defaultValue) {
@@ -194,7 +194,6 @@ PYBIND11_MODULE(mmkv, m) {
             return defaultValue;
         },
         "decode a bytes value", py::arg("key"), py::arg("defaultValue") = py::bytes());
-#endif
 
     clsMMKV.def("__contains__", &MMKV::containsKey, py::arg("key"));
     clsMMKV.def("keys", &MMKV::allKeys);

POSIX/Python/setup.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+# import re
+import sys
+# import platform
+import subprocess
+
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+# from distutils.version import LooseVersion
+
+
+class CMakeExtension(Extension):
+    def __init__(self, name, sourcedir=''):
+        Extension.__init__(self, name, sources=[])
+        self.sourcedir = os.path.abspath(sourcedir)
+
+
+class CMakeBuild(build_ext):
+    def run(self):
+        try:
+            out = subprocess.check_output(['cmake', '--version'])
+        except OSError:
+            raise RuntimeError("CMake must be installed to build the following extensions: " +
+                               ", ".join(e.name for e in self.extensions))
+
+        # if platform.system() == "Windows":
+        #     cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+        #     if cmake_version < '3.1.0':
+        #         raise RuntimeError("CMake >= 3.1.0 is required on Windows")
+
+        for ext in self.extensions:
+            self.build_extension(ext)
+
+    def build_extension(self, ext):
+        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        # required for auto-detection of auxiliary "native" libs
+        if not extdir.endswith(os.path.sep):
+            extdir += os.path.sep
+
+        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+                      '-DPYTHON_EXECUTABLE=' + sys.executable]
+
+        cfg = 'Debug' if self.debug else 'Release'
+        build_args = ['--config', cfg]
+
+        # if platform.system() == "Windows":
+        #     cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
+        #     if sys.maxsize > 2 ** 32:
+        #         cmake_args += ['-A', 'x64']
+        #     build_args += ['--', '/m']
+        # else:
+        if True:
+            cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
+            build_args += ['--', '-j8']
+
+        env = os.environ.copy()
+        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''), self.distribution.get_version())
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
+        subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
+
+
+setup(
+    name='mmkv',
+    version='1.2.2',
+    author='Tencent',
+    description='An efficient, small key-value storage framework developed by WeChat Team.',
+    long_description='The MMKV, for Python. MMKV is an efficient, generic, easy-to-use key-value storage framework '
+                     'developed by the WeChat Team. It can be a replacement for SQLite.',
+    ext_modules=[CMakeExtension('mmkv')],
+    cmdclass=dict(build_ext=CMakeBuild),
+    zip_safe=False,
+)

POSIX/Python/unit_test.py

@@ -1,5 +1,6 @@
-#!/ usr / bin / env python
-# - * - coding : utf - 8 - * -
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 import sys
 import mmkv
 
@@ -138,7 +139,10 @@ def test_string(kv):
     assert ret
 
     value = kv.getString('String')
-    assert value == OlympicString
+    if sys.version_info >= (3, 0):
+        assert value == OlympicString
+    else:
+        assert value == OlympicString.decode('utf-8')
 
     value = kv.getString(KeyNotExist)
     assert (not value) or (len(value) == 0)
@@ -157,14 +161,20 @@ def test_bytes(kv):
 
     value = kv.getBytes('Bytes')
     assert value == OlympicYearsBytes
-    value = list(value)
-    assert value == OlympicYears
+    if sys.version_info >= (3, 0):
+        value = list(value)
+        assert value == OlympicYears
 
     value = kv.getBytes(KeyNotExist)
     assert (not value) or (len(value) == 0)
 
-    value = kv.getBytes(KeyNotExist, bytes('哦豁', 'utf8'))
-    assert value == bytes('哦豁', 'utf8')
+    default_value = None
+    if sys.version_info >= (3, 0):
+        default_value = bytes('哦豁', 'utf8')
+    else:
+        default_value = bytes('a')
+    value = kv.getBytes(KeyNotExist, default_value)
+    assert value == default_value
 
     print('test bytes: passed')