Skip to content

Commit 327cdbc

Browse files
committed
renamed 'include' package to 'includes' because 'include' is a keyword in Cython
--HG-- rename : src/lxml/include/__init__.py => src/lxml/includes/__init__.py rename : src/lxml/include/c14n.pxd => src/lxml/includes/c14n.pxd rename : src/lxml/include/config.pxd => src/lxml/includes/config.pxd rename : src/lxml/include/dtdvalid.pxd => src/lxml/includes/dtdvalid.pxd rename : src/lxml/include/etree_defs.h => src/lxml/includes/etree_defs.h rename : src/lxml/include/etreepublic.pxd => src/lxml/includes/etreepublic.pxd rename : src/lxml/include/htmlparser.pxd => src/lxml/includes/htmlparser.pxd rename : src/lxml/include/relaxng.pxd => src/lxml/includes/relaxng.pxd rename : src/lxml/include/schematron.pxd => src/lxml/includes/schematron.pxd rename : src/lxml/include/tree.pxd => src/lxml/includes/tree.pxd rename : src/lxml/include/uri.pxd => src/lxml/includes/uri.pxd rename : src/lxml/include/xinclude.pxd => src/lxml/includes/xinclude.pxd rename : src/lxml/include/xmlerror.pxd => src/lxml/includes/xmlerror.pxd rename : src/lxml/include/xmlparser.pxd => src/lxml/includes/xmlparser.pxd rename : src/lxml/include/xmlschema.pxd => src/lxml/includes/xmlschema.pxd rename : src/lxml/include/xpath.pxd => src/lxml/includes/xpath.pxd rename : src/lxml/include/xslt.pxd => src/lxml/includes/xslt.pxd
1 parent fb27443 commit 327cdbc

22 files changed

+8
-8
lines changed

setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
'lxml.etree.h',
7373
'lxml.etree_api.h',
7474
],
75-
'lxml.include': [
75+
'lxml.includes': [
7676
'*.pxd', '*.h'
7777
],
7878
'lxml.isoschematron': [
@@ -88,7 +88,7 @@
8888
}
8989

9090
extra_options['packages'] = [
91-
'lxml', 'lxml.include', 'lxml.html', 'lxml.isoschematron'
91+
'lxml', 'lxml.includes', 'lxml.html', 'lxml.isoschematron'
9292
]
9393

9494

@@ -157,10 +157,10 @@ def build_packages(files):
157157

158158
for package_path, (root_path, filenames) in header_packages.items():
159159
if package_path:
160-
package = 'lxml.include.' + package_path
160+
package = 'lxml.includes.' + package_path
161161
packages.append(package)
162162
else:
163-
package = 'lxml.include'
163+
package = 'lxml.includes'
164164
package_data[package] = filenames
165165
package_dir[package] = root_path
166166

setupinfo.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
EXT_MODULES = ["lxml.etree", "lxml.objectify"]
1414

1515
PACKAGE_PATH = "src/lxml/"
16-
INCLUDE_PACKAGE_PATH = PACKAGE_PATH + '/include'
16+
INCLUDE_PACKAGE_PATH = PACKAGE_PATH + 'includes'
1717

1818
if sys.version_info[0] >= 3:
1919
_system_encoding = sys.getdefaultencoding()

src/lxml/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def get_include():
99
with statically linked libraries.
1010
"""
1111
lxml_path = __path__[0]
12-
include_path = os.path.join(lxml_path, 'include')
12+
include_path = os.path.join(lxml_path, 'includes')
1313
includes = [include_path, lxml_path]
1414

1515
for name in os.listdir(include_path):
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

update-error-constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys, os, os.path, re, codecs
44

55
BUILD_SOURCE_FILE = os.path.join("src", "lxml", "xmlerror.pxi")
6-
BUILD_DEF_FILE = os.path.join("src", "lxml", "xmlerror.pxd")
6+
BUILD_DEF_FILE = os.path.join("src", "lxml", "includes", "xmlerror.pxd")
77

88
if len(sys.argv) < 2 or sys.argv[1].lower() in ('-h', '--help'):
99
print("This script generates the constants in file %s" % BUILD_SOURCE_FILE)

versioninfo.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def create_version_h(svn_version):
118118
svn_version += '.0'
119119

120120
version_h = open(
121-
os.path.join(get_base_dir(), 'src', 'lxml', 'include', 'lxml-version.h'),
121+
os.path.join(get_base_dir(), 'src', 'lxml', 'includes', 'lxml-version.h'),
122122
'w')
123123
version_h.write('''\
124124
#ifndef LXML_VERSION_STRING

0 commit comments

Comments
 (0)