Merge pull request #5599 from hornc/dnb

Import DNB ids from MARC records

openlibrary/catalog/marc/marc_binary.py

@@ -5,20 +5,13 @@
 from openlibrary.catalog.marc.marc_base import MarcBase, MarcException, BadMARC
 
 
-import six
-
-
 marc8 = MARC8ToUnicode(quiet=True)
 
 
 class BadLength(MarcException):
     pass
 
 
-def norm(s):
-    return normalize('NFC', six.text_type(s))
-
-
 def handle_wrapped_lines(_iter):
     """ 
     Handles wrapped MARC fields, which appear to be multiple
@@ -86,6 +79,9 @@ def remove_brackets(self):
             self.line = b''.join([line[0:4], line[5:-2], last_byte])
 
     def get_subfields(self, want):
+        """
+        :rtype: collections.Iterable[tuple]
+        """
         want = set(want)
         for i in self.line[3:-1].split(b'\x1f'):
             code = i and (chr(i[0]) if isinstance(i[0], int) else i[0])
@@ -100,6 +96,9 @@ def get_contents(self, want):
         return contents
 
     def get_subfield_values(self, want):
+        """
+        :rtype: list[str]
+        """
         return [v for k, v in self.get_subfields(want)]
 
     def get_all_subfields(self):