Merge branch '7.0branch'

Author: kata198

AdvancedHTMLParser/Parser.py

@@ -407,7 +407,7 @@ def containsUid(self, uid):
             @return <bool> - If #uid is found within this tree
         '''
         for rootNode in self.getRootNodes():
-            if rootNode.containsUid(em):
+            if rootNode.containsUid(uid):
                 return True
 
         return False
@@ -443,7 +443,7 @@ def filter(self, **kwargs):
         if canFilterTags is False:
             raise NotImplementedError('filter methods requires QueryableList installed, it is not. Either install QueryableList, or try the less-robust "find" method, or the getElement* methods.')
 
-        allNodes = self.getAllChildNodes() + [self]
+        allNodes = self.getAllNodes()
 
         filterableNodes = FilterableTagCollection(allNodes)
 

AdvancedHTMLParser/__init__.py

@@ -10,9 +10,9 @@
 from .exceptions import InvalidCloseException, MissedCloseException, HTMLValidationException
 from .SpecialAttributes import StyleAttribute
 
-__version__ = '7.0.0'
-__version_tuple__ = ('7', '0', '0')
-__int_version_tuple__ = (7, 0, 0)
+__version__ = '7.0.1'
+__version_tuple__ = ('7', '0', '1')
+__int_version_tuple__ = (7, 0, 1)
 
 __all__ = ( 'AdvancedHTMLParser', 'IndexedAdvancedHTMLParser', 'AdvancedHTMLFormatter', 'AdvancedTag', 'TagCollection',
     'ValidatingAdvancedHTMLParser', 'MissedCloseException', 'InvalidCloseException', 'HTMLValidationException', 'StyleAttribute', 'toggleAttributesDOM' )

ChangeLog

@@ -1,3 +1,7 @@
+* 7.0.1 Apr 28 2017
+
+- Fix two typos which would result in exceptions
+
 * 7.0.0 Apr 6 2017
 - Add "filter"-style functions (think ORM-style filtering, like
 name__contains='abc' or name='abc' or name__ne='something'). Supports all filter operations provided by QueryableList

setup.py

@@ -38,7 +38,7 @@
         long_description = summary
 
     setup(name='AdvancedHTMLParser',
-            version='7.0.0',
+            version='7.0.1',
             packages=['AdvancedHTMLParser'],
             scripts=['formatHTML'],
             author='Tim Savannah',