Resolved conflict for PR #161

.gitignore

@@ -7,6 +7,8 @@ ports/xcode_macos/
 products/
 tmp/
 API.pdf
+cache/
+dist/
 
 # ZeroTier-specific 
 *.conf
@@ -47,9 +49,20 @@ gen/
 
 # Python
 *.py[co]
-packages/PyPI/libzt.egg-info/
 *.pypirc
 __pycache__/
+*.egg-info/
+pkg/pypi/dist/
+pkg/pypi/libzt/libzt.py
+pkg/pypi/libzt/node.py
+pkg/pypi/libzt/select.py
+pkg/pypi/libzt/sockets.py
+pkg/pypi/native
+pkg/pypi/LICENSE
+
+# SWIG
+src/bindings/python/libzt.py
+src/bindings/python/zt_wrap.*
 
 # Junk
 *.DS_Store

src/bindings/python/zt_wrap.h

@@ -1,60 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.2
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIG_libzt_WRAP_H_
-#define SWIG_libzt_WRAP_H_
-
-#include <map>
-#include <string>
-
-
-class SwigDirector_PythonDirectorCallbackClass : public PythonDirectorCallbackClass, public Swig::Director {
-
-public:
-    SwigDirector_PythonDirectorCallbackClass(PyObject *self);
-    virtual void on_zerotier_event(zts_event_msg_t *msg);
-    virtual ~SwigDirector_PythonDirectorCallbackClass();
-
-/* Internal director utilities */
-public:
-    bool swig_get_inner(const char *swig_protected_method_name) const {
-      std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);
-      return (iv != swig_inner.end() ? iv->second : false);
-    }
-    void swig_set_inner(const char *swig_protected_method_name, bool swig_val) const {
-      swig_inner[swig_protected_method_name] = swig_val;
-    }
-private:
-    mutable std::map<std::string, bool> swig_inner;
-
-#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
-/* VTable implementation */
-    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
-      PyObject *method = vtable[method_index];
-      if (!method) {
-        swig::SwigVar_PyObject name = SWIG_Python_str_FromChar(method_name);
-        method = PyObject_GetAttr(swig_get_self(), name);
-        if (!method) {
-          std::string msg = "Method in class PythonDirectorCallbackClass doesn't exist, undefined ";
-          msg += method_name;
-          Swig::DirectorMethodException::raise(msg.c_str());
-        }
-        vtable[method_index] = method;
-      }
-      return method;
-    }
-private:
-    mutable swig::SwigVar_PyObject vtable[1];
-#endif
-
-};
-
-
-#endif