move python to top directory

Makefile.am

 SUBDIRS = src
+
 if ENABLE_TOOLS
 SUBDIRS += tools
 endif
+
+if USE_CYTHON
+SUBDIRS += python
+endif
+
 if HAVE_DOXYGEN
 SUBDIRS += doc
 endif

configure.ac

@@ -78,7 +78,7 @@ AC_ARG_ENABLE([tools], AS_HELP_STRING([--disable-tools],[Disable tools (CLI DHT
 AM_CONDITIONAL(ENABLE_TOOLS, test x$build_tools == xyes)
 
 AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])])
-AM_COND_IF([USE_CYTHON], [AC_CONFIG_FILES([tools/python/Makefile])])
+AM_COND_IF([USE_CYTHON], [AC_CONFIG_FILES([python/Makefile])])
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile

tools/python/opendht.pyx → python/opendht.pyx

@@ -5,8 +5,10 @@
 # distutils: libraries = opendht gnutls
 # cython: language_level=3
 #
-# opendht.pyx - Copyright 2015 by Guillaume Roguez <yomgui1 AT gmail DOT com>
-# A Python3 wrapper to access to OpenDHT API
+# Copyright (c) 2015 Savoir-Faire Linux Inc. 
+# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+#
 # This wrapper is written for Cython 0.22
 # 
 # This file is part of OpenDHT Python Wrapper.
@@ -25,7 +27,6 @@
 #    along with OpenDHT Python Wrapper. If not, see <http://www.gnu.org/licenses/>.
 #
 
-
 from libc.stdint cimport *
 from libcpp.string cimport string
 from libcpp.vector cimport vector

tools/python/setup.py → python/setup.py

-# This file is copyright 2015 by Guillaume Roguez <yomgui1 AT gmail DOT com>
+# Copyright (c) 2015 Savoir-Faire Linux Inc. 
+# Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
+# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+#
 # A Python3 wrapper to access to OpenDHT API
 # This wrapper is written for Cython 0.22
 #

tools/python/scanner.py → python/tools/scanner.py

-import time
+#!/usr/bin/env python3
+# Copyright (c) 2015 Savoir-Faire Linux Inc.
+# Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHERWISE
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import time, sys
 from pprint import pprint
 from math import cos, sin, pi
 
+sys.path.append('..')
 from opendht import *
 
 import numpy as np

tools/Makefile.am

-if USE_CYTHON
-SUBDIRS = python
-endif
-
 libexec_PROGRAMS = dhtnode dhtchat dhtscanner
 
 AM_CPPFLAGS = -I../include