Ported some more tests, fixed an encoding problem, and added rudimentary doctype handling.

1 files changed, 5 insertions, 3 deletions

diff --git a/beautifulsoup/element.py b/beautifulsoup/element.py
index bd9bcbf..b2e0e12 100644
--- a/beautifulsoup/element.py
+++ b/beautifulsoup/element.py
@@ -346,9 +346,6 @@ class NavigableString(unicode, PageElement):
         else:
             raise AttributeError, "'%s' object has no attribute '%s'" % (self.__class__.__name__, attr)
 
-    def encode(self, encoding=DEFAULT_OUTPUT_ENCODING):
-        return self.decode().encode(encoding)
-
     def decodeGivenEventualEncoding(self, eventualEncoding):
         return self
 
@@ -373,6 +370,11 @@ class Declaration(NavigableString):
     def decodeGivenEventualEncoding(self, eventualEncoding):
         return u'<!' + self + u'>'
 
+class Doctype(NavigableString):
+
+    def decodeGivenEventualEncoding(self, eventualEncoding):
+        return u'<!DOCTYPE ' + self + u'>'
+
 class Tag(PageElement, Entities):
 
     """Represents a found HTML tag with its attributes and contents."""