diff options
| -rwxr-xr-x | configure.py | 2 | ||||
| -rw-r--r-- | doc/contributing.rst | 4 | ||||
| -rw-r--r-- | doc/downloads.rst | 0 | ||||
| -rw-r--r-- | doc/manual/building.rst | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/after_success.sh | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/build.sh | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/travis/lint.sh | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/configure.py b/configure.py index 7559f75ec..8e2d30510 100755 --- a/configure.py +++ b/configure.py @@ -376,7 +376,7 @@ def process_command_line(args): build_group.add_option('--with-python-versions', dest='python_version', metavar='N.M', default='%d.%d' % (sys.version_info[0], sys.version_info[1]), - help='where to install botan.py (def %default)') + help='where to install botan2.py (def %default)') build_group.add_option('--with-valgrind', help='use valgrind API', dest='with_valgrind', action='store_true', default=False) diff --git a/doc/contributing.rst b/doc/contributing.rst index 5aaf3d61c..092fe2fcd 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -11,7 +11,7 @@ Under ``src`` there are directories example ``build-data/cc/gcc.txt`` describes various gcc options. * ``scripts`` contains misc scripts: install, distribution, various codegen things. Scripts controlling CI go under ``scripts/ci``. -* ``python/botan.py`` is the Python ctypes wrapper +* ``python/botan2.py`` is the Python ctypes wrapper Library Layout ======================================== @@ -103,7 +103,7 @@ PyPy, etc is great when viable (in the sense of not causing problems for 2.7 or program succesfully is required for a working build making it as portable as possible is considered key. -The python wrapper botan.py targets CPython 2.7, 3.x, and latest PyPy. Note that +The python wrapper botan2.py targets CPython 2.7, 3.x, and latest PyPy. Note that a single file is used to avoid dealing with any of Python's various crazy module distribution issues. diff --git a/doc/downloads.rst b/doc/downloads.rst new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/doc/downloads.rst diff --git a/doc/manual/building.rst b/doc/manual/building.rst index 5e09d1569..9c0dc0ab1 100644 --- a/doc/manual/building.rst +++ b/doc/manual/building.rst @@ -409,7 +409,7 @@ Building the Python wrappers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The Python wrappers for Botan use ctypes and the C89 API so no special -build step is required, just import botan.py +build step is required, just import botan2.py See :doc:`Python Bindings <python>` for more information about the Python bindings. diff --git a/src/scripts/ci/travis/after_success.sh b/src/scripts/ci/travis/after_success.sh index 769a8fac4..6e28e0d44 100755 --- a/src/scripts/ci/travis/after_success.sh +++ b/src/scripts/ci/travis/after_success.sh @@ -8,7 +8,7 @@ if [ "$BUILD_MODE" = "coverage" ]; then /tmp/bin/lcov --gcov-tool "$GCOV" --remove $(pwd)/coverage.info.in 'tests/*' '/usr/*' --output-file $(pwd)/coverage.info /tmp/bin/lcov --gcov-tool "$GCOV" --list $(pwd)/coverage.info - LD_LIBRARY_PATH=. coverage run --branch src/python/botan.py + LD_LIBRARY_PATH=. coverage run --branch src/python/botan2.py codecov fi diff --git a/src/scripts/ci/travis/build.sh b/src/scripts/ci/travis/build.sh index b2dd482c8..71d33d1bb 100755 --- a/src/scripts/ci/travis/build.sh +++ b/src/scripts/ci/travis/build.sh @@ -186,7 +186,7 @@ then for py in python2 python3 do $py --version - LD_LIBRARY_PATH=. $py src/python/botan.py + LD_LIBRARY_PATH=. $py src/python/botan2.py done fi diff --git a/src/scripts/ci/travis/lint.sh b/src/scripts/ci/travis/lint.sh index 36657e92a..91407c3b4 100755 --- a/src/scripts/ci/travis/lint.sh +++ b/src/scripts/ci/travis/lint.sh @@ -8,6 +8,6 @@ python2 -m pylint configure.py echo "travis_fold:end:pylint_configure" echo "travis_fold:start:pylint_botanpy" -python3 -m pylint src/python/botan.py -python2 -m pylint src/python/botan.py +python3 -m pylint src/python/botan2.py +python2 -m pylint src/python/botan2.py echo "travis_fold:end:pylint_botanpy" |