clean up some code

1 files changed, 10 insertions, 7 deletions

diff --git a/src/lxml/dtd.pxi b/src/lxml/dtd.pxi
index 93a5b0a5..947c4831 100644
--- a/src/lxml/dtd.pxi
+++ b/src/lxml/dtd.pxi
@@ -297,15 +297,21 @@ cdef class DTD(_Validator):
 
     property name:
        def __get__(self):
-          return funicode(self._c_dtd.name) if (self._c_dtd is not NULL and self._c_dtd.name is not NULL) else None
+           if self._c_dtd is NULL:
+               return None
+           return funicodeOrNone(self._c_dtd.name)
 
     property external_id:
        def __get__(self):
-          return funicode(self._c_dtd.ExternalID) if (self._c_dtd is not NULL and self._c_dtd.ExternalID is not NULL) else None
+           if self._c_dtd is NULL:
+               return None
+           return funicodeOrNone(self._c_dtd.ExternalID)
 
     property system_url:
        def __get__(self):
-          return funicode(self._c_dtd.SystemID) if (self._c_dtd is not NULL and self._c_dtd.SystemID is not NULL) else None
+           if self._c_dtd is NULL:
+               return None
+           return funicodeOrNone(self._c_dtd.SystemID)
 
     def iterelements(self):
         cdef tree.xmlNode *c_node = self._c_dtd.children if self._c_dtd is not NULL else NULL
@@ -368,10 +374,7 @@ cdef class DTD(_Validator):
         if ret == -1:
             raise DTDValidateError(u"Internal error in DTD validation",
                                    self._error_log)
-        if ret == 1:
-            return True
-        else:
-            return False
+        return ret == 1
 
 
 cdef tree.xmlDtd* _parseDtdFromFilelike(file) except NULL: