--- a/components/python/pylxml/Makefile	Wed Mar 29 09:12:26 2017 -0700
+++ b/components/python/pylxml/Makefile	Wed Mar 29 16:47:08 2017 -0700
@@ -26,17 +26,17 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		lxml
-COMPONENT_VERSION=	2.3.3
+COMPONENT_VERSION=	3.6.4
 COMPONENT_PROJECT_URL=	http://lxml.de/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2a3ca34f63b062ee8e059ca2460ac18040ec9622f0a31e143383f0db944ceb36
+    sha256:61d5d3e00b5821e6cda099b3b4ccfea4527bf7c595e0fb3a7a760490cedd6172
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_BUGDB=	python-mod/lxml
 COMPONENT_ANITYA_ID=	3914
 
-TPNO=			17146
+TPNO=			31680
 
 # disable optimization to prevent the Studio compilers from spinning
 studio_OPT.i386.32 =
@@ -50,19 +50,40 @@
 
 COMPONENT_TEST_ARGS=	test
 COMPONENT_TEST_CMD=	$(MAKE) -i
-COMPONENT_TEST_DIR=	$(SOURCE_DIR)
-COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
+
+# Prevent errors like: 'UnicodeEncodeError: 'ascii' codec can't encode
+# characters in position 5-18: ordinal not in range(128)'
+# Taken from https://illumos.org/issues/6538
+COMPONENT_TEST_ENV+=	LC_ALL=en_US.UTF-8
+
+# Prevent errors like: OSError: Error reading file 'http://127.0.0.1:59951/':
+# failed to load HTTP resource
+COMPONENT_TEST_ENV+=	http_proxy=
+COMPONENT_TEST_ENV+=	https_proxy=
+COMPONENT_TEST_ENV+=	HTTP_PROXY=
+COMPONENT_TEST_ENV+=	HTTPS_PROXY=
+
+# Use the correct version of Python each time.
+COMPONENT_TEST_ENV+=	PYTHON=$(PYTHON)
+
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "/\(cc\).*/d" ' \
 	'-e "/\(PYTHONPATH\).*/d" ' \
 	'-e "/\(Doctest\).*/d" ' \
 	'-e "/\(Building\).*/d" ' \
 	'-e "/\(building\).*/d" ' \
+	'-e "/\(Compiling\).*/d" ' \
+	'-e "/\(Cythonizing\).*/d" ' \
         '-e "/\(copying\).*/d" ' \
 	'-e "/\(creating\).*/d" ' \
-	'-e "s|\(Ran 1368 tests\).*|\1|" '
+	'-e "/\(prototype:\).*/d" ' \
+	'-e "/\(warning:\).*/d" ' \
+	'-e "/\(ignored\).*/d" ' \
+	'-e "/\(argument :\).*/d" ' \
+	'-e "/\(cannot find\).*/d" ' \
+	'-e "s|\(Ran [0-9][0-9]* tests\).*|\1|" '
 
-# common targets
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)