1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
|
Description: The C Extension should now compile under both Python 2 and 3.
From 51369dadc037c19c7c22eedd7433b278822959f2 Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <atheriel@gmail.com>
Date: Sat, 1 Mar 2014 17:25:09 -0500
Last-Update: 2014-09-29
diff --git a/scss/src/_speedups.c b/scss/src/_speedups.c
index b4b990c..6b4ea28 100644
--- a/scss/src/_speedups.c
+++ b/scss/src/_speedups.c
@@ -9,11 +9,12 @@
* Copyright (c) 2011 German M. Bravo (Kronuz), All rights reserved.
*/
#include <Python.h>
+#include "py3defs.h"
#include "block_locator.h"
#include "scanner.h"
/* BlockLocator */
-staticforward PyTypeObject scss_BlockLocatorType;
+static PyTypeObject scss_BlockLocatorType;
typedef struct {
PyObject_HEAD
@@ -46,7 +47,7 @@ scss_BlockLocator_dealloc(scss_BlockLocator *self)
{
if (self->locator != NULL) BlockLocator_del(self->locator);
- self->ob_type->tp_free((PyObject*)self);
+ Py_TYPE(self)->tp_free((PyObject*)self);
#ifdef DEBUG
PySys_WriteStderr("Scss BlockLocator object destroyed!\n");
@@ -93,8 +94,7 @@ scss_BlockLocator_iternext(scss_BlockLocator *self)
/* Type definition */
static PyTypeObject scss_BlockLocatorType = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
+ PyVarObject_HEAD_INIT(NULL, 0)
"scss._BlockLocator", /* tp_name */
sizeof(scss_BlockLocator), /* tp_basicsize */
0, /* tp_itemsize */
@@ -136,7 +136,7 @@ static PyTypeObject scss_BlockLocatorType = {
/* Scanner */
static PyObject *PyExc_scss_NoMoreTokens;
-staticforward PyTypeObject scss_ScannerType;
+static PyTypeObject scss_ScannerType;
typedef struct {
PyObject_HEAD
@@ -179,8 +179,13 @@ scss_Scanner_token(scss_Scanner *self, PyObject *args)
_restrictions = PyMem_New(Pattern, size);
iter = PyObject_GetIter(restrictions);
while ((item = PyIter_Next(iter))) {
+#if PY_MAJOR_VERSION >= 3
+ if (PyBytes_Check(item)) {
+ _restrictions[restrictions_sz].tok = PyBytes_AsString(item);
+#else
if (PyString_Check(item)) {
_restrictions[restrictions_sz].tok = PyString_AsString(item);
+#endif
_restrictions[restrictions_sz].expr = NULL;
restrictions_sz++;
}
@@ -263,9 +268,15 @@ scss_Scanner_setup_patterns(PyObject *self, PyObject *patterns)
if (_is_tuple || PyList_Check(item)) {
item0 = _is_tuple ? PyTuple_GetItem(item, 0) : PyList_GetItem(item, 0);
item1 = _is_tuple ? PyTuple_GetItem(item, 1) : PyList_GetItem(item, 1);
+#if PY_MAJOR_VERSION >= 3
+ if (PyBytes_Check(item0) && PyBytes_Check(item1)) {
+ _patterns[patterns_sz].tok = PyBytes_AsString(item0);
+ _patterns[patterns_sz].expr = PyBytes_AsString(item1);
+#else
if (PyString_Check(item0) && PyString_Check(item1)) {
_patterns[patterns_sz].tok = PyString_AsString(item0);
_patterns[patterns_sz].expr = PyString_AsString(item1);
+#endif
patterns_sz++;
}
}
@@ -310,9 +321,15 @@ scss_Scanner_init(scss_Scanner *self, PyObject *args, PyObject *kwds)
if (_is_tuple || PyList_Check(item)) {
item0 = _is_tuple ? PyTuple_GetItem(item, 0) : PyList_GetItem(item, 0);
item1 = _is_tuple ? PyTuple_GetItem(item, 1) : PyList_GetItem(item, 1);
+#if PY_MAJOR_VERSION >= 3
+ if (PyBytes_Check(item0) && PyBytes_Check(item1)) {
+ _patterns[patterns_sz].tok = PyBytes_AsString(item0);
+ _patterns[patterns_sz].expr = PyBytes_AsString(item1);
+#else
if (PyString_Check(item0) && PyString_Check(item1)) {
_patterns[patterns_sz].tok = PyString_AsString(item0);
_patterns[patterns_sz].expr = PyString_AsString(item1);
+#endif
patterns_sz++;
}
}
@@ -327,8 +344,13 @@ scss_Scanner_init(scss_Scanner *self, PyObject *args, PyObject *kwds)
_ignore = PyMem_New(Pattern, size);
for (i = 0; i < size; ++i) {
item = is_tuple ? PyTuple_GetItem(ignore, i) : PyList_GetItem(ignore, i);
+#if PY_MAJOR_VERSION >= 3
+ if (PyBytes_Check(item)) {
+ _ignore[ignore_sz].tok = PyBytes_AsString(item);
+#else
if (PyString_Check(item)) {
_ignore[ignore_sz].tok = PyString_AsString(item);
+#endif
_ignore[ignore_sz].expr = NULL;
ignore_sz++;
}
@@ -357,6 +379,22 @@ scss_Scanner_repr(scss_Scanner *self)
if (self->scanner != NULL && self->scanner->tokens_sz) {
start = self->scanner->tokens_sz - 10;
+#if PY_MAJOR_VERSION >= 3
+ repr = PyBytes_FromString("");
+ for (i = (start < 0) ? 0 : start; i < self->scanner->tokens_sz; i++) {
+ p_token = &self->scanner->tokens[i];
+ PyBytes_ConcatAndDel(&repr, PyBytes_FromString("\n"));
+ pos = (int)(p_token->string - self->scanner->input);
+ PyBytes_ConcatAndDel(&repr, PyBytes_FromFormat(" (@%d) %s = ",
+ pos, p_token->regex->tok));
+ tmp = PyBytes_FromStringAndSize(p_token->string, p_token->string_sz);
+ PyBytes_ConcatAndDel(&repr, PyObject_Repr(tmp));
+ Py_XDECREF(tmp);
+ }
+ } else {
+ repr = PyBytes_FromString("None");
+ }
+#else
repr = PyString_FromString("");
for (i = (start < 0) ? 0 : start; i < self->scanner->tokens_sz; i++) {
p_token = &self->scanner->tokens[i];
@@ -371,6 +409,7 @@ scss_Scanner_repr(scss_Scanner *self)
} else {
repr = PyString_FromString("None");
}
+#endif
return (PyObject *)repr;
@@ -442,7 +481,7 @@ scss_Scanner_dealloc(scss_Scanner *self)
{
if (self->scanner != NULL) Scanner_del(self->scanner);
- self->ob_type->tp_free((PyObject*)self);
+ Py_TYPE(self)->tp_free((PyObject*)self);
#ifdef DEBUG
PySys_WriteStderr("Scss Scanner object destroyed!\n");
@@ -458,8 +497,7 @@ static PyMethodDef scss_Scanner_methods[] = {
};
static PyTypeObject scss_ScannerType = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
+ PyVarObject_HEAD_INIT(NULL, 0)
"scss.Scanner", /* tp_name */
sizeof(scss_Scanner), /* tp_basicsize */
0, /* tp_itemsize */
@@ -521,27 +559,53 @@ static PyMethodDef scss_methods[] = {
{NULL, NULL, 0, NULL} /* Sentinel */
};
+#if PY_MAJOR_VERSION >= 3
+
+/* Module definition */
+
+static struct PyModuleDef speedups_module_def = {
+ PyModuleDef_HEAD_INIT,
+ "_speedups", /* m_name */
+ NULL, /* m_doc */
+ (Py_ssize_t) -1, /* m_size */
+ scss_methods, /* m_methods */
+ NULL, /* m_reload */
+ NULL, /* m_traverse */
+ NULL, /* m_clear */
+ NULL, /* m_free */
+};
+
+#endif
/* Module init function */
-PyMODINIT_FUNC
-init_speedups(void)
+#if PY_MAJOR_VERSION >= 3
+ #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+#else
+ #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
+#endif
+
+MOD_INIT(_speedups)
{
- PyObject* m;
+#if PY_MAJOR_VERSION >= 3
+ PyObject* m = PyModule_Create(&speedups_module_def);
+#else
+ PyObject* m = Py_InitModule("_speedups", scss_methods);
+#endif
scss_BlockLocatorType.tp_new = PyType_GenericNew;
- if (PyType_Ready(&scss_BlockLocatorType) < 0)
- return;
-
scss_ScannerType.tp_new = PyType_GenericNew;
- if (PyType_Ready(&scss_ScannerType) < 0)
+#if PY_MAJOR_VERSION >= 3
+ if (PyType_Ready(&scss_BlockLocatorType) < 0 || PyType_Ready(&scss_ScannerType) < 0)
+ return m;
+#else
+ if (PyType_Ready(&scss_BlockLocatorType) < 0 || PyType_Ready(&scss_ScannerType) < 0)
return;
+#endif
BlockLocator_initialize();
Scanner_initialize(NULL, 0);
- m = Py_InitModule("_speedups", scss_methods);
-
Py_INCREF(&scss_BlockLocatorType);
PyModule_AddObject(m, "_BlockLocator", (PyObject *)&scss_BlockLocatorType);
@@ -551,4 +615,8 @@ init_speedups(void)
PyExc_scss_NoMoreTokens = PyErr_NewException("_speedups.NoMoreTokens", NULL, NULL);
Py_INCREF(PyExc_scss_NoMoreTokens);
PyModule_AddObject(m, "NoMoreTokens", (PyObject *)PyExc_scss_NoMoreTokens);
+#if PY_MAJOR_VERSION >= 3
+
+ return m;
+#endif
}
diff --git a/scss/src/py3defs.h b/scss/src/py3defs.h
new file mode 100644
index 0000000..e0c332c
--- /dev/null
+++ b/scss/src/py3defs.h
@@ -0,0 +1,29 @@
+/*
+* pyScss, a Scss compiler for Python
+* SCSS blocks scanner.
+*
+* German M. Bravo (Kronuz) <german.mb@gmail.com>
+* https://github.com/Kronuz/pyScss
+*
+* MIT license (http://www.opensource.org/licenses/mit-license.php)
+* Copyright (c) 2011 German M. Bravo (Kronuz), All rights reserved.
+*/
+#ifndef PY3DEFS_H
+#define PY3DEFS_H
+
+/* Iterators are turned on by default in Python 3. */
+#if PY_MAJOR_VERSION >= 3
+ #define Py_TPFLAGS_HAVE_ITER 0
+#endif
+
+/* Py_TYPE exists in 2.6+, but for 2.5 and below we can use the old ob_type. */
+#ifndef Py_TYPE
+ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+#endif
+
+/* PyVarObject_HEAD_INIT also exists in 2.6+, so for 2.5 use PyObject_HEAD_INIT. */
+#ifndef PyVarObject_HEAD_INIT
+ #define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+#endif
+
+#endif
|
