Merge pull request #11 from jagerman/remove-bencode

Remove base32z encoding
This commit is contained in:
Jason Rhinelander 2022-08-04 14:28:54 -03:00 committed by GitHub
commit 30a9a26ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 39 deletions

View File

@ -3,7 +3,7 @@ from setuptools import setup
# Available at setup time due to pyproject.toml
from pybind11.setup_helpers import Pybind11Extension, build_ext
__version__ = "1.0.2"
__version__ = "1.0.3"
# Note:
# Sort input source files if you glob sources to ensure bit-for-bit
@ -11,7 +11,7 @@ __version__ = "1.0.2"
ext_modules = [Pybind11Extension(
"oxenmq",
["src/bencode.cpp", "src/module.cpp", "src/oxenmq.cpp"],
["src/oxenmq.cpp"],
cxx_std=17,
libraries=["oxenmq"],
),

View File

@ -1,15 +0,0 @@
#include "common.hpp"
#include "oxenmq/base32z.h"
namespace oxenmq {
void BEncode_Init(py::module& mod) {
mod.def("base32z_encode", [](py::bytes data) {
char* ptr = nullptr;
py::ssize_t sz = 0;
PyBytes_AsStringAndSize(data.ptr(), &ptr, &sz);
return oxenmq::to_base32z(ptr, ptr+sz);
});
}
}

View File

@ -1,13 +0,0 @@
#pragma once
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <pybind11/functional.h>
namespace py = pybind11;
namespace oxenmq {
void OxenMQ_Init(py::module &mod);
void BEncode_Init(py::module & mod);
}

View File

@ -1,6 +0,0 @@
#include "common.hpp"
PYBIND11_MODULE(oxenmq, m) {
oxenmq::OxenMQ_Init(m);
oxenmq::BEncode_Init(m);
}

View File

@ -1,4 +1,3 @@
#include "common.hpp"
#include <chrono>
#include <exception>
#include <oxenmq/oxenmq.h>
@ -14,6 +13,8 @@
#include <memory>
#include <variant>
namespace py = pybind11;
namespace oxenmq {
// Convert a py::object containing a str, bytes, or iterable over str/bytes to a vector of message
@ -51,8 +52,7 @@ struct stderr_logger {
}
};
void
OxenMQ_Init(py::module& mod)
PYBIND11_MODULE(oxenmq, mod)
{
using namespace pybind11::literals;
constexpr py::kw_only kwonly{};