[Lxml-checkins] r32552 - in lxml/trunk: . doc src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Thu Sep 21 10:40:17 2006
New Revision: 32552

Modified:
   lxml/trunk/CHANGES.txt
   lxml/trunk/doc/main.txt
   lxml/trunk/src/lxml/etree.pyx
Log:
merged in 1.1.1 release changes from branch

Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt	(original)
+++ lxml/trunk/CHANGES.txt	Thu Sep 21 10:40:17 2006
@@ -2,8 +2,8 @@
 lxml changelog
 ==============
 
-current
-=======
+1.1.1 (2006-09-21)
+==================
 
 Features added
 --------------

Modified: lxml/trunk/doc/main.txt
==============================================================================
--- lxml/trunk/doc/main.txt	(original)
+++ lxml/trunk/doc/main.txt	Thu Sep 21 10:40:17 2006
@@ -29,6 +29,8 @@
 
 .. _`installation instructions`: installation.html
 
+* `lxml 1.1.1`_, released 2006-09-21 (`changes for 1.1.1`_)
+
 * `lxml 1.1`_, released 2006-09-13 (`changes for 1.1`_)
 
 * `lxml 1.0.4`_, released 2006-09-09 (`changes for 1.0.4`_)
@@ -57,6 +59,7 @@
 
 * `lxml 0.5`_,   released 2005-04-08
 
+.. _`lxml 1.1.1`: lxml-1.1.1.tgz
 .. _`lxml 1.1`: lxml-1.1.tgz
 .. _`lxml 1.0.4`: lxml-1.0.4.tgz
 .. _`lxml 1.0.3`: lxml-1.0.3.tgz
@@ -72,6 +75,7 @@
 .. _`lxml 0.5.1`: lxml-0.5.1.tgz
 .. _`lxml 0.5`: lxml-0.5.tgz
 
+.. _`CHANGES for 1.1.1`: changes-1.1.1.html
 .. _`CHANGES for 1.1`: changes-1.1.html
 .. _`CHANGES for 1.0.4`: changes-1.0.4.html
 .. _`CHANGES for 1.0.3`: changes-1.0.3.html

Modified: lxml/trunk/src/lxml/etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/etree.pyx	(original)
+++ lxml/trunk/src/lxml/etree.pyx	Thu Sep 21 10:40:17 2006
@@ -542,7 +542,7 @@
         evaluator = XPathDocumentEvaluator(self, namespaces, extensions)
         return evaluator.evaluate(_path, **_variables)
 
-    def xslt(self, _xslt, extensions=None, **_kw):
+    def xslt(self, _xslt, extensions=None, access_control=None, **_kw):
         """Transform this document using other document.
 
         xslt is a tree that should be XSLT
@@ -555,7 +555,8 @@
         class directly.
         """
         self._assertHasRoot()
-        style = XSLT(_xslt, extensions)
+        style = XSLT(_xslt, extensions=extensions,
+                     access_control=access_control)
         return style(self, **_kw)
 
     def relaxng(self, relaxng):