Skip to content

Commit 515c54d

Browse files
committed
Add binaries for Blender 3.1 on Mac M1
Thanks @KieranCoughlan!
1 parent 5f5e7ea commit 515c54d

File tree

133 files changed

+34572
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+34572
-39
lines changed

blender/LilySurfaceScraper/site-packages/arm/lxml/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# this is a package
22

3-
__version__ = "4.6.3"
3+
__version__ = "4.8.0"
44

55

66
def get_include():
225 KB
Binary file not shown.
118 KB
Binary file not shown.

blender/LilySurfaceScraper/site-packages/arm/lxml/builder.py

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
from __future__ import absolute_import
4343

4444
import lxml.etree as ET
45+
_QName = ET.QName
4546

4647
from functools import partial
4748

@@ -147,34 +148,22 @@ def CLASS(v):
147148

148149
def __init__(self, typemap=None,
149150
namespace=None, nsmap=None, makeelement=None):
150-
if namespace is not None:
151-
self._namespace = '{' + namespace + '}'
152-
else:
153-
self._namespace = None
151+
self._namespace = '{' + namespace + '}' if namespace is not None else None
152+
self._nsmap = dict(nsmap) if nsmap else None
154153

155-
if nsmap:
156-
self._nsmap = dict(nsmap)
157-
else:
158-
self._nsmap = None
154+
assert makeelement is None or callable(makeelement)
155+
self._makeelement = makeelement if makeelement is not None else ET.Element
159156

160-
if makeelement is not None:
161-
assert callable(makeelement)
162-
self._makeelement = makeelement
163-
else:
164-
self._makeelement = ET.Element
165-
166-
# initialize type map for this element factory
167-
168-
if typemap:
169-
typemap = dict(typemap)
170-
else:
171-
typemap = {}
157+
# initialize the default type map functions for this element factory
158+
typemap = dict(typemap) if typemap else {}
172159

173160
def add_text(elem, item):
174161
try:
175-
elem[-1].tail = (elem[-1].tail or "") + item
162+
last_child = elem[-1]
176163
except IndexError:
177164
elem.text = (elem.text or "") + item
165+
else:
166+
last_child.tail = (last_child.tail or "") + item
178167

179168
def add_cdata(elem, cdata):
180169
if elem.text:
@@ -195,6 +184,7 @@ def add_dict(elem, item):
195184
attrib[k] = v
196185
else:
197186
attrib[k] = typemap[type(v)](None, v)
187+
198188
if dict not in typemap:
199189
typemap[dict] = add_dict
200190

@@ -203,7 +193,11 @@ def add_dict(elem, item):
203193
def __call__(self, tag, *children, **attrib):
204194
typemap = self._typemap
205195

206-
if self._namespace is not None and tag[0] != '{':
196+
# We'll usually get a 'str', and the compiled type check is very fast.
197+
if not isinstance(tag, str) and isinstance(tag, _QName):
198+
# A QName is explicitly qualified, do not look at self._namespace.
199+
tag = tag.text
200+
elif self._namespace is not None and tag[0] != '{':
207201
tag = self._namespace + tag
208202
elem = self._makeelement(tag, nsmap=self._nsmap)
209203
if attrib:
5.01 MB
Binary file not shown.

blender/LilySurfaceScraper/site-packages/arm/lxml/etree.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by Cython 0.29.22 */
1+
/* Generated by Cython 0.29.28 */
22

33
#ifndef __PYX_HAVE__lxml__etree
44
#define __PYX_HAVE__lxml__etree
@@ -13,7 +13,7 @@ struct LxmlElementBase;
1313
struct LxmlElementClassLookup;
1414
struct LxmlFallbackElementClassLookup;
1515

16-
/* "lxml/etree.pyx":322
16+
/* "lxml/etree.pyx":337
1717
*
1818
* # type of a function that steps from node to node
1919
* ctypedef public xmlNode* (*_node_to_node_function)(xmlNode*) # <<<<<<<<<<<<<<
@@ -22,7 +22,7 @@ struct LxmlFallbackElementClassLookup;
2222
*/
2323
typedef xmlNode *(*_node_to_node_function)(xmlNode *);
2424

25-
/* "lxml/etree.pyx":338
25+
/* "lxml/etree.pyx":353
2626
* @cython.final
2727
* @cython.freelist(8)
2828
* cdef public class _Document [ type LxmlDocumentType, object LxmlDocument ]: # <<<<<<<<<<<<<<
@@ -38,7 +38,7 @@ struct LxmlDocument {
3838
struct __pyx_obj_4lxml_5etree__BaseParser *_parser;
3939
};
4040

41-
/* "lxml/etree.pyx":687
41+
/* "lxml/etree.pyx":702
4242
*
4343
* @cython.no_gc_clear
4444
* cdef public class _Element [ type LxmlElementType, object LxmlElement ]: # <<<<<<<<<<<<<<
@@ -52,7 +52,7 @@ struct LxmlElement {
5252
PyObject *_tag;
5353
};
5454

55-
/* "lxml/etree.pyx":1854
55+
/* "lxml/etree.pyx":1869
5656
*
5757
*
5858
* cdef public class _ElementTree [ type LxmlElementTreeType, # <<<<<<<<<<<<<<
@@ -66,7 +66,7 @@ struct LxmlElementTree {
6666
struct LxmlElement *_context_node;
6767
};
6868

69-
/* "lxml/etree.pyx":2598
69+
/* "lxml/etree.pyx":2613
7070
*
7171
*
7272
* cdef public class _ElementTagMatcher [ object LxmlElementTagMatcher, # <<<<<<<<<<<<<<
@@ -82,7 +82,7 @@ struct LxmlElementTagMatcher {
8282
char *_name;
8383
};
8484

85-
/* "lxml/etree.pyx":2629
85+
/* "lxml/etree.pyx":2644
8686
* self._name = NULL
8787
*
8888
* cdef public class _ElementIterator(_ElementTagMatcher) [ # <<<<<<<<<<<<<<

blender/LilySurfaceScraper/site-packages/arm/lxml/etree_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by Cython 0.29.22 */
1+
/* Generated by Cython 0.29.28 */
22

33
#ifndef __PYX_HAVE_API__lxml__etree
44
#define __PYX_HAVE_API__lxml__etree
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
__doc__ = """Legacy interface to the BeautifulSoup HTML parser.
2+
"""
3+
4+
__all__ = ["parse", "convert_tree"]
5+
6+
from .soupparser import convert_tree, parse as _parse
7+
8+
def parse(file, beautifulsoup=None, makeelement=None):
9+
root = _parse(file, beautifulsoup=beautifulsoup, makeelement=makeelement)
10+
return root.getroot()

0 commit comments

Comments
 (0)