[Checkins] SVN: z3c.dav/trunk/src/z3c/dav/ fixed some small deprecated warnings/errors in the tests

Markus Leist leist at ing-buero-ikom.de
Thu Sep 4 07:21:26 EDT 2008


Log message for revision 90800:
  fixed some small deprecated warnings/errors in the tests

Changed:
  U   z3c.dav/trunk/src/z3c/dav/locking.py
  U   z3c.dav/trunk/src/z3c/dav/properties.py

-=-
Modified: z3c.dav/trunk/src/z3c/dav/locking.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/locking.py	2008-09-04 10:58:29 UTC (rev 90799)
+++ z3c.dav/trunk/src/z3c/dav/locking.py	2008-09-04 11:21:25 UTC (rev 90800)
@@ -314,14 +314,14 @@
         etree = z3c.etree.getEngine()
 
         lockscope = xmlsource.find("{DAV:}lockscope")
-        if not lockscope:
+        if lockscope is None:
             raise z3c.dav.interfaces.UnprocessableError(
                 self.context,
                 message = u"No `{DAV:}lockscope' XML element in request")
         lockscope_str = z3c.dav.utils.parseEtreeTag(lockscope[0].tag)[1]
 
         locktype = xmlsource.find("{DAV:}locktype")
-        if not locktype:
+        if locktype is None:
             raise z3c.dav.interfaces.UnprocessableError(
                 self.context,
                 message = u"No `{DAV:}locktype' XML element in request")

Modified: z3c.dav/trunk/src/z3c/dav/properties.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/properties.py	2008-09-04 10:58:29 UTC (rev 90799)
+++ z3c.dav/trunk/src/z3c/dav/properties.py	2008-09-04 11:21:25 UTC (rev 90800)
@@ -136,7 +136,7 @@
 
         etree = z3c.etree.getEngine()
         # XXX - ascii seems a bit wrong here
-        return etree.tostring(el[-1], "utf-8")
+        return etree.tostring(el[-1], encoding="utf-8")
 
 
 class IOpaqueField(IField):



More information about the Checkins mailing list