aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-02-24 16:57:39 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-02-24 17:08:39 +0300
commit0c3f2ea6d063ccca39427b25d021119c25323f87 (patch)
treeca8cde1e825d02ae3ebbb0a799d1994fa8b772a9
parent3cd9fd5e8335820231d39e6d9f7722ef3eb47c0c (diff)
downloadydb-0c3f2ea6d063ccca39427b25d021119c25323f87.tar.gz
Remove unnecessary patch
`_pickle.c` works this around since 3.11.1 / rXXXXXX by having the following stanza at beggining of the file: ``` #ifdef MS_WINDOWS #define FLOAT FLOAT_ #define INT INT_ #define LONG LONG_ #endif ``` 8ac860799f2860a9dfb3e590f514b1ac7a2c3a9e
-rw-r--r--contrib/tools/python3/Modules/_pickle.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/tools/python3/Modules/_pickle.c b/contrib/tools/python3/Modules/_pickle.c
index 43d968f524..2bf9977f0b 100644
--- a/contrib/tools/python3/Modules/_pickle.c
+++ b/contrib/tools/python3/Modules/_pickle.c
@@ -58,11 +58,11 @@ enum opcode {
POP = '0',
POP_MARK = '1',
DUP = '2',
- FLOAT_ = 'F',
- INT_ = 'I',
+ FLOAT = 'F',
+ INT = 'I',
BININT = 'J',
BININT1 = 'K',
- LONG_ = 'L',
+ LONG = 'L',
BININT2 = 'M',
NONE = 'N',
PERSID = 'P',
@@ -2167,7 +2167,7 @@ save_long(PicklerObject *self, PyObject *obj)
}
}
else {
- sprintf(pdata, "%c%ld\n", INT_, val);
+ sprintf(pdata, "%c%ld\n", INT, val);
len = strlen(pdata);
}
if (_Pickler_Write(self, pdata, len) < 0)
@@ -2255,7 +2255,7 @@ save_long(PicklerObject *self, PyObject *obj)
goto error;
}
else {
- const char long_op = LONG_;
+ const char long_op = LONG;
const char *string;
/* proto < 2: write the repr and newline. This is quadratic-time (in
@@ -2301,7 +2301,7 @@ save_float(PicklerObject *self, PyObject *obj)
else {
int result = -1;
char *buf = NULL;
- char op = FLOAT_;
+ char op = FLOAT;
if (_Pickler_Write(self, &op, 1) < 0)
goto done;
@@ -6872,11 +6872,11 @@ load(PickleState *st, UnpicklerObject *self)
OP(BININT, load_binint)
OP(BININT1, load_binint1)
OP(BININT2, load_binint2)
- OP(INT_, load_int)
- OP(LONG_, load_long)
+ OP(INT, load_int)
+ OP(LONG, load_long)
OP_ARG(LONG1, load_counted_long, 1)
OP_ARG(LONG4, load_counted_long, 4)
- OP(FLOAT_, load_float)
+ OP(FLOAT, load_float)
OP(BINFLOAT, load_binfloat)
OP_ARG(SHORT_BINBYTES, load_counted_binbytes, 1)
OP_ARG(BINBYTES, load_counted_binbytes, 4)