Merge lp:~jelmer/brz/drop-old-compat into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/drop-old-compat
Merge into: lp:brz
Diff against target: 35 lines (+0/-20)
1 file modified
breezy/python-compat.h (+0/-20)
To merge this branch: bzr merge lp:~jelmer/brz/drop-old-compat
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+325131@code.launchpad.net

Commit message

Drop pyx support for python < 2.7.

Description of the change

Drop pyx support for python < 2.7.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/python-compat.h'
2--- breezy/python-compat.h 2010-08-23 21:36:06 +0000
3+++ breezy/python-compat.h 2017-06-06 00:00:56 +0000
4@@ -25,18 +25,6 @@
5 #ifndef _BZR_PYTHON_COMPAT_H
6 #define _BZR_PYTHON_COMPAT_H
7
8-/* http://www.python.org/dev/peps/pep-0353/ */
9-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
10- typedef int Py_ssize_t;
11- typedef Py_ssize_t (*lenfunc)(PyObject *);
12- typedef PyObject * (*ssizeargfunc)(PyObject *, Py_ssize_t);
13- typedef PyObject * (*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
14- #define PY_SSIZE_T_MAX INT_MAX
15- #define PY_SSIZE_T_MIN INT_MIN
16- #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
17- #define PyInt_AsSsize_t(o) PyInt_AsLong(o)
18-#endif
19-
20 #if defined(_WIN32) || defined(WIN32)
21 /* Defining WIN32_LEAN_AND_MEAN makes including windows quite a bit
22 * lighter weight.
23@@ -79,12 +67,4 @@
24 #define strtoull _strtoui64
25 #endif
26
27-/* Introduced in Python 2.6 */
28-#ifndef Py_TYPE
29-# define Py_TYPE(o) ((o)->ob_type)
30-#endif
31-#ifndef Py_REFCNT
32-# define Py_REFCNT(o) ((o)->ob_refcnt)
33-#endif
34-
35 #endif /* _BZR_PYTHON_COMPAT_H */

Subscribers

People subscribed via source and target branches