use items instead of iteritems

src/icalendar/caselessdict.py

@@ -77,7 +77,7 @@ class CaselessDict(dict):
         """
         Multiple keys where key1.upper() == key2.upper() will be lost.
         """
-        for key, value in indict.iteritems():
+        for key, value in indict.items():  # TODO optimize in python 2
             self[key] = value
 
     def copy(self):

src/icalendar/parser.py

@@ -192,8 +192,7 @@ class Parameters(CaselessDict):
     def to_ical(self):
         result = []
         items = self.items()
-        items.sort()  # To make doctests work
-        for key, value in items:
+        for key, value in sorted(items):
             value = param_value(value)
             if isinstance(value, compat.unicode_type):
                 value = value.encode(DEFAULT_ENCODING)
@@ -312,7 +311,7 @@ class Contentline(compat.unicode_type):
                                           strict=self.strict)
             params = Parameters(
                 (unsescape_string(key), unsescape_string(value))
-                for key, value in params.iteritems()
+                for key, value in params.items()  # TODO optimize for python 2?
             )
             values = unsescape_string(st[value_split + 1:])
             return (name, params, values)

src/icalendar/parser_tools.py

@@ -25,7 +25,7 @@ def data_encode(data, encoding=DEFAULT_ENCODING):
     if isinstance(data, compat.unicode_type):
         return data.encode(encoding)
     elif isinstance(data, dict):
-        return dict(map(data_encode, data.iteritems()))
+        return dict(map(data_encode, data.items()))  # TODO: optimize for python 2?
     elif isinstance(data, list) or isinstance(data, tuple):
         return list(map(data_encode, data))
     else: