This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11862

fsmonitor: incorporate fixes for Python 3.10 (issue6612)
ClosedPublic

Authored by Alphare on Dec 6 2021, 5:11 AM.

Details

Reviewers
SimonSapin
marmoute
Group Reviewers
hg-reviewers
Commits
rHG5140461ee947: fsmonitor: incorporate fixes for Python 3.10 (issue6612)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Dec 6 2021, 5:11 AM

Pending CI refresh

Alphare added a comment.Dec 6 2021, 5:15 AM

This should probably go to stable now that I think about it. The rebase will not be an issue, so I'm not updating this.

SimonSapin accepted this revision.Dec 7 2021, 6:13 AM
SimonSapin added a subscriber: SimonSapin.

Looks good. I’ve found PY_SSIZE_T_CLEAN documented at https://docs.python.org/3/c-api/arg.html#strings-and-buffers

marmoute accepted this revision.Dec 7 2021, 6:44 AM
Alphare added a commit: rHG5140461ee947: fsmonitor: incorporate fixes for Python 3.10 (issue6612).Dec 7 2021, 9:29 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5140461ee947: fsmonitor: incorporate fixes for Python 3.10 (issue6612) (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fsmonitor/pywatchman/bser.c (5 lines)

Diff 31345

hgext/fsmonitor/pywatchman/bser.c

FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include <bytesobject.h> #include <bytesobject.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#define inline __inline #define inline __inline
#if _MSC_VER >= 1800 #if _MSC_VER >= 1800
#include <stdint.h> #include <stdint.h>
#else #else
// The compiler associated with Python 2.7 on Windows doesn't ship // The compiler associated with Python 2.7 on Windows doesn't ship
static int pdu_info_helper( static int pdu_info_helper(
PyObject* self, PyObject* self,
PyObject* args, PyObject* args,
uint32_t* bser_version_out, uint32_t* bser_version_out,
uint32_t* bser_capabilities_out, uint32_t* bser_capabilities_out,
int64_t* total_len_out) { int64_t* total_len_out) {
const char* start = NULL; const char* start = NULL;
const char* data = NULL; const char* data = NULL;
int datalen = 0; Py_ssize_t datalen = 0;
const char* end; const char* end;
int64_t expected_len; int64_t expected_len;
off_t position; off_t position;
if (!PyArg_ParseTuple(args, "s#", &start, &datalen)) { if (!PyArg_ParseTuple(args, "s#", &start, &datalen)) {
return 0; return 0;
} }
data = start; data = start;
if (!pdu_info_helper(self, args, &version, &capabilities, &total_len)) { if (!pdu_info_helper(self, args, &version, &capabilities, &total_len)) {
return NULL; return NULL;
} }
return Py_BuildValue("L", total_len); return Py_BuildValue("L", total_len);
} }
static PyObject* bser_loads(PyObject* self, PyObject* args, PyObject* kw) { static PyObject* bser_loads(PyObject* self, PyObject* args, PyObject* kw) {
const char* data = NULL; const char* data = NULL;
int datalen = 0; Py_ssize_t datalen = 0;
const char* start; const char* start;
const char* end; const char* end;
int64_t expected_len; int64_t expected_len;
off_t position; off_t position;
PyObject* mutable_obj = NULL; PyObject* mutable_obj = NULL;
const char* value_encoding = NULL; const char* value_encoding = NULL;
const char* value_errors = NULL; const char* value_errors = NULL;
unser_ctx_t ctx = {1, 0}; unser_ctx_t ctx = {1, 0};