Minor formatting updates.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8482 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

3 files changed, 9 insertions, 12 deletions

diff --git a/docutils/docutils/nodes.py b/docutils/docutils/nodes.py
index 562f0254f..11e9aabaa 100644
--- a/docutils/docutils/nodes.py
+++ b/docutils/docutils/nodes.py
@@ -620,6 +620,12 @@ class Element(Node):
     def __len__(self):
         return len(self.children)
 
+    def __contains__(self, key):
+        # Test for both, children and attributes with operator ``in``.
+        if isinstance(key, basestring):
+            return key in self.attributes
+        return key in self.children
+
     def __getitem__(self, key):
         if isinstance(key, basestring):
             return self.attributes[key]
@@ -703,14 +709,6 @@ class Element(Node):
 
     has_key = hasattr
 
-    # support operator ``in``
-    def __contains__(self, key):
-        # support both membership test for children and attributes
-        # (has_key is translated to "in" by 2to3)
-        if isinstance(key, basestring):
-            return key in self.attributes
-        return key in self.children
-
     def get_language_code(self, fallback=''):
         """Return node's language tag.
 
diff --git a/docutils/docutils/utils/__init__.py b/docutils/docutils/utils/__init__.py
index 02243b040..519ee3dfe 100644
--- a/docutils/docutils/utils/__init__.py
+++ b/docutils/docutils/utils/__init__.py
@@ -681,7 +681,6 @@ def normalize_language_tag(tag):
     # find all combinations of subtags
     taglist = []
     for n in range(len(subtags), 0, -1):
-        # for tags in unique_combinations(subtags, n):
         for tags in itertools.combinations(subtags, n):
             taglist.append('-'.join(base_tag+tags))
     taglist += base_tag
diff --git a/docutils/test/test_utils.py b/docutils/test/test_utils.py
index 855cea39f..9f69a34c0 100755
--- a/docutils/test/test_utils.py
+++ b/docutils/test/test_utils.py
@@ -267,9 +267,9 @@ class HelperFunctionTests(unittest.TestCase):
                          ['de-at', 'de'])
         self.assertEqual(utils.normalize_language_tag('de-AT-1901'),
                          ['de-at-1901', 'de-at', 'de-1901', 'de'])
-        self.assertEqual(utils.normalize_language_tag('de-AT-1901-frak'),
-                         ['de-at-1901-frak', 'de-at-1901', 'de-at-frak',
-                          'de-1901-frak', 'de-at', 'de-1901', 'de-frak', 'de'])
+        self.assertEqual(utils.normalize_language_tag('de-AT-1901-Latf'),
+                         ['de-at-1901-latf', 'de-at-1901', 'de-at-latf',
+                          'de-1901-latf', 'de-at', 'de-1901', 'de-latf', 'de'])
         self.assertEqual(utils.normalize_language_tag('grc-ibycus-x-altquot'),
                          ['grc-ibycus-x-altquot', 'grc-ibycus',
                           'grc-x-altquot', 'grc'])