Removed iteritems and itervalues, which are redundant

ebook_converter/ebooks/metadata/xmp.py

@@ -12,7 +12,6 @@ from ebook_converter.ebooks.metadata.book.base import Metadata
 from ebook_converter.ebooks.metadata.opf2 import dump_dict
 from ebook_converter.utils.date import parse_date, isoformat, now
 from ebook_converter.utils.localization import canonicalize_lang, lang_as_iso639_1
-from ebook_converter.polyglot.builtins import iteritems
 
 
 __license__ = 'GPL v3'
@@ -320,7 +319,7 @@ def metadata_from_xmp_packet(raw_bytes):
                     identifiers[scheme] = val
 
     # Check Dublin Core for recognizable identifier types
-    for scheme, check_func in iteritems({'doi':check_doi, 'isbn':check_isbn}):
+    for scheme, check_func in {'doi':check_doi, 'isbn':check_isbn}.items():
         if scheme not in identifiers:
             val = check_func(first_simple('//dc:identifier', root))
             if val:
@@ -404,7 +403,7 @@ def create_identifiers(xmp, identifiers):
     xmp.append(xmpid)
     bag = xmpid.makeelement(expand('rdf:Bag'))
     xmpid.append(bag)
-    for scheme, value in iteritems(identifiers):
+    for scheme, value in identifiers.items():
         li = bag.makeelement(expand('rdf:li'))
         li.set(expand('rdf:parseType'), 'Resource')
         bag.append(li)
@@ -440,7 +439,7 @@ def create_user_metadata(calibre, all_user_metadata):
     calibre.append(s)
     bag = s.makeelement(expand('rdf:Bag'))
     s.append(bag)
-    for name, fm in iteritems(all_user_metadata):
+    for name, fm in all_user_metadata.items():
         try:
             fm = copy.copy(fm)
             encode_is_multiple(fm)
@@ -470,12 +469,12 @@ def metadata_to_xmp_packet(mi):
     dc = rdf.makeelement(expand('rdf:Description'), nsmap=nsmap('dc'))
     dc.set(expand('rdf:about'), '')
     rdf.append(dc)
-    for prop, tag in iteritems({'title':'dc:title', 'comments':'dc:description'}):
+    for prop, tag in {'title':'dc:title', 'comments':'dc:description'}.items():
         val = mi.get(prop) or ''
         create_alt_property(dc, tag, val)
-    for prop, (tag, ordered) in iteritems({
-        'authors':('dc:creator', True), 'tags':('dc:subject', False), 'publisher':('dc:publisher', False),
-    }):
+    for prop, (tag, ordered) in {'authors': ('dc:creator', True),
+                                 'tags': ('dc:subject', False),
+                                 'publisher': ('dc:publisher', False)}.items():
         val = mi.get(prop) or ()
         if isinstance(val, (str, bytes)):
             val = [val]
@@ -499,9 +498,9 @@ def metadata_to_xmp_packet(mi):
     identifiers = mi.get_identifiers()
     if identifiers:
         create_identifiers(xmp, identifiers)
-        for scheme, val in iteritems(identifiers):
+        for scheme, val in identifiers.items():
             if scheme in {'isbn', 'doi'}:
-                for prefix, parent in iteritems(extra_ids):
+                for prefix, parent in extra_ids.items():
                     ie = parent.makeelement(expand('%s:%s'%(prefix, scheme)))
                     ie.text = val
                     parent.append(ie)
@@ -549,7 +548,7 @@ def find_used_namespaces(elem):
 
 def find_preferred_prefix(namespace, elems):
     for elem in elems:
-        ans = {v:k for k, v in iteritems(elem.nsmap)}.get(namespace, None)
+        ans = {v:k for k, v in elem.nsmap.items()}.get(namespace, None)
         if ans is not None:
             return ans
         return find_preferred_prefix(namespace, elem.iterchildren(etree.Element))
@@ -561,7 +560,7 @@ def find_nsmap(elems):
         used_namespaces |= find_used_namespaces(elem)
     ans = {}
     used_namespaces -= {NS_MAP['xml'], NS_MAP['x'], None, NS_MAP['rdf']}
-    rmap = {v:k for k, v in iteritems(NS_MAP)}
+    rmap = {v:k for k, v in NS_MAP.items()}
     i = 0
     for ns in used_namespaces:
         if ns in rmap: