diff --git a/pykolab/cli/cmd_user_info.py b/pykolab/cli/cmd_user_info.py
--- a/pykolab/cli/cmd_user_info.py
+++ b/pykolab/cli/cmd_user_info.py
@@ -53,7 +53,7 @@
 
     unic_attrs = ['displayname', 'givenname', 'cn', 'sn', 'ou', 'entrydn']
 
-    for (k,v) in user_info.iteritems():
+    for (k,v) in user_info.items():
         if k in unic_attrs:
             print "%s: %s" % (k,v)
         else:
diff --git a/pykolab/wap_client/__init__.py b/pykolab/wap_client/__init__.py
--- a/pykolab/wap_client/__init__.py
+++ b/pykolab/wap_client/__init__.py
@@ -337,7 +337,7 @@
 def group_find(params=None):
     post = { 'search': { 'params': {} } }
 
-    for (k,v) in params.iteritems():
+    for (k,v) in params.items():
         post['search']['params'][k] = { 'value': v, 'type': 'exact' }
 
     return request('POST', 'group.find', post=json.dumps(post))
@@ -371,7 +371,7 @@
 def ou_find(params=None):
     post = { 'search': { 'params': {} } }
 
-    for (k,v) in params.iteritems():
+    for (k,v) in params.items():
         post['search']['params'][k] = { 'value': v, 'type': 'exact' }
 
     return request('POST', 'ou.find', post=json.dumps(post))
@@ -459,7 +459,7 @@
 def resource_find(params=None):
     post = { 'search': { 'params': {} } }
 
-    for (k,v) in params.iteritems():
+    for (k,v) in params.items():
         post['search']['params'][k] = { 'value': v, 'type': 'exact' }
 
     return request('POST', 'resource.find', post=json.dumps(post))
@@ -615,7 +615,7 @@
     else:
         post = { 'search': { 'params': {} } }
 
-        for (k,v) in attribs.iteritems():
+        for (k,v) in attribs.items():
             post['search']['params'][k] = { 'value': v, 'type': 'exact' }
 
     post = json.dumps(post)
diff --git a/pykolab/xml/attendee.py b/pykolab/xml/attendee.py
--- a/pykolab/xml/attendee.py
+++ b/pykolab/xml/attendee.py
@@ -210,7 +210,7 @@
         return self.rsvp()
 
     def _translate_value(self, val, map):
-        name_map = dict([(v, k) for (k, v) in map.iteritems()])
+        name_map = dict([(v, k) for (k, v) in map.items()])
         return name_map[val] if name_map.has_key(val) else 'UNKNOWN'
 
     def set_cutype(self, cutype):
@@ -248,7 +248,7 @@
         data = self.contactreference.to_dict()
         data.pop('type', None)
 
-        for p, getter in self.properties_map.iteritems():
+        for p, getter in self.properties_map.items():
             val = None
             args = {}
             if hasattr(self, getter):
diff --git a/pykolab/xml/contact.py b/pykolab/xml/contact.py
--- a/pykolab/xml/contact.py
+++ b/pykolab/xml/contact.py
@@ -160,7 +160,7 @@
         return _gender
 
     def _translate_value(self, val, map):
-        name_map = dict([(v, k) for (k, v) in map.iteritems()])
+        name_map = dict([(v, k) for (k, v) in map.items()])
         return name_map[val] if name_map.has_key(val) else 'UNKNOWN'
 
     def to_dict(self):
@@ -169,7 +169,7 @@
 
         data = self._names2dict(self.nameComponents())
 
-        for p, getter in self.properties_map.iteritems():
+        for p, getter in self.properties_map.items():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
@@ -223,7 +223,7 @@
 
         data = dict()
 
-        for p, getter in names_map.iteritems():
+        for p, getter in names_map.items():
             val = None
             if hasattr(namecomp, getter):
                 val = getattr(namecomp, getter)()
@@ -243,7 +243,7 @@
 
         data = dict()
 
-        for p, getter in props_map.iteritems():
+        for p, getter in props_map.items():
             val = None
             if hasattr(affiliation, getter):
                 val = getattr(affiliation, getter)()
@@ -269,7 +269,7 @@
             'code':     'code',
             'country':  'country',
         }
-        addresstype_map = dict([(v, k) for (k, v) in self.addresstype_map.iteritems()])
+        addresstype_map = dict([(v, k) for (k, v) in self.addresstype_map.items()])
 
         data = dict()
 
@@ -279,7 +279,7 @@
         if adrtype is not None:
             data['type'] = adrtype
 
-        for p, getter in props_map.iteritems():
+        for p, getter in props_map.items():
             val = None
             if hasattr(adr, getter):
                 val = getattr(adr, getter)()
@@ -293,7 +293,7 @@
     def _relateds2dict(self, relateds, aslist=True):
         data = dict()
 
-        related_map = dict([(v, k) for (k, v) in self.related_map.iteritems()])
+        related_map = dict([(v, k) for (k, v) in self.related_map.items()])
         for rel in relateds:
             reltype = related_map.get(rel.relationTypes(), None)
             val = rel.uri() if rel.type() == kolabformat.Related.Uid else rel.text()
@@ -308,7 +308,7 @@
         return data
 
     def _struct2dict(self, struct, propname, map):
-        type_map = dict([(v, k) for (k, v) in map.iteritems()])
+        type_map = dict([(v, k) for (k, v) in map.items()])
         result = dict()
 
         if hasattr(struct, 'types'):
diff --git a/pykolab/xml/contact_reference.py b/pykolab/xml/contact_reference.py
--- a/pykolab/xml/contact_reference.py
+++ b/pykolab/xml/contact_reference.py
@@ -44,7 +44,7 @@
     def to_dict(self):
         data = dict()
 
-        for p, getter in self.properties_map.iteritems():
+        for p, getter in self.properties_map.items():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
diff --git a/pykolab/xml/event.py b/pykolab/xml/event.py
--- a/pykolab/xml/event.py
+++ b/pykolab/xml/event.py
@@ -554,28 +554,28 @@
             if rsvp in attendee.rsvp_map.keys():
                 _rsvp = rsvp
             elif rsvp in attendee.rsvp_map.values():
-                _rsvp = [k for k, v in attendee.rsvp_map.iteritems() if v == rsvp][0]
+                _rsvp = [k for k, v in attendee.rsvp_map.items() if v == rsvp][0]
             else:
                 _rsvp = None
 
             if role in attendee.role_map.keys():
                 _role = role
             elif role in attendee.role_map.values():
-                _role = [k for k, v in attendee.role_map.iteritems() if v == role][0]
+                _role = [k for k, v in attendee.role_map.items() if v == role][0]
             else:
                 _role = None
 
             if partstat in attendee.participant_status_map.keys():
                 _partstat = partstat
             elif partstat in attendee.participant_status_map.values():
-                _partstat = [k for k, v in attendee.participant_status_map.iteritems() if v == partstat][0]
+                _partstat = [k for k, v in attendee.participant_status_map.items() if v == partstat][0]
             else:
                 _partstat = None
 
             if cutype in attendee.cutype_map.keys():
                 _cutype = cutype
             elif cutype in attendee.cutype_map.values():
-                _cutype = [k for k, v in attendee.cutype_map.iteritems() if v == cutype][0]
+                _cutype = [k for k, v in attendee.cutype_map.items() if v == cutype][0]
             else:
                 _cutype = None
 
@@ -611,7 +611,7 @@
         if attendee.get_participant_status() in attendee.participant_status_map.keys():
             return attendee.get_participant_status()
         elif attendee.get_participant_status() in attendee.participant_status_map.values():
-            return [k for k, v in attendee.participant_status_map.iteritems() if v == attendee.get_participant_status()][0]
+            return [k for k, v in attendee.participant_status_map.items() if v == attendee.get_participant_status()][0]
         else:
             raise ValueError, _("Invalid participant status")
 
@@ -1116,7 +1116,7 @@
     def to_dict(self):
         data = dict()
 
-        for p, getter in self.properties_map.iteritems():
+        for p, getter in self.properties_map.items():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
@@ -1176,7 +1176,7 @@
         return ret
 
     def _translate_value(self, val, map):
-        name_map = dict([(v, k) for (k, v) in map.iteritems()])
+        name_map = dict([(v, k) for (k, v) in map.items()])
         return name_map[val] if name_map.has_key(val) else 'UNKNOWN'
 
     def to_message(self, creator=None):
diff --git a/pykolab/xml/note.py b/pykolab/xml/note.py
--- a/pykolab/xml/note.py
+++ b/pykolab/xml/note.py
@@ -99,7 +99,7 @@
         self.setCategories(_categories)
 
     def _translate_value(self, val, map):
-        name_map = dict([(v, k) for (k, v) in map.iteritems()])
+        name_map = dict([(v, k) for (k, v) in map.items()])
         return name_map[val] if name_map.has_key(val) else 'UNKNOWN'
 
     def to_dict(self):
@@ -108,7 +108,7 @@
 
         data = dict()
 
-        for p, getter in self.properties_map.iteritems():
+        for p, getter in self.properties_map.items():
             val = None
             if hasattr(self, getter):
                 val = getattr(self, getter)()
diff --git a/pykolab/xml/recurrence_rule.py b/pykolab/xml/recurrence_rule.py
--- a/pykolab/xml/recurrence_rule.py
+++ b/pykolab/xml/recurrence_rule.py
@@ -181,7 +181,7 @@
             getattr(self, setter)(val)
 
     def _translate_value(self, val, map):
-        name_map = dict([(v, k) for (k, v) in map.iteritems()])
+        name_map = dict([(v, k) for (k, v) in map.items()])
         return name_map[val] if name_map.has_key(val) else 'UNKNOWN'
 
     def to_ical(self):
@@ -194,7 +194,7 @@
 
         data = dict()
 
-        for p, getter in self.properties_map.iteritems():
+        for p, getter in self.properties_map.items():
             val = None
             args = {}
             if hasattr(self, getter):
diff --git a/pykolab/xml/utils.py b/pykolab/xml/utils.py
--- a/pykolab/xml/utils.py
+++ b/pykolab/xml/utils.py
@@ -338,7 +338,7 @@
 
         # accept partial match
         if partial:
-            for k,v in aa.iteritems():
+            for k,v in aa.items():
                 if bb.has_key(k) and bb[k] == v:
                     return True
 
diff --git a/tests/unit/test-002-attendee.py b/tests/unit/test-002-attendee.py
--- a/tests/unit/test-002-attendee.py
+++ b/tests/unit/test-002-attendee.py
@@ -48,13 +48,13 @@
 
     def test_007_participant_status_map_reverse_lookup(self):
         # Reverse lookups
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 0][0], "NEEDS-ACTION")
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 1][0], "ACCEPTED")
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 2][0], "DECLINED")
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 3][0], "TENTATIVE")
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 4][0], "DELEGATED")
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 5][0], "IN-PROCESS")
-        self.assertEqual([k for k, v in self.attendee.participant_status_map.iteritems() if v == 6][0], "COMPLETED")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 0][0], "NEEDS-ACTION")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 1][0], "ACCEPTED")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 2][0], "DECLINED")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 3][0], "TENTATIVE")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 4][0], "DELEGATED")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 5][0], "IN-PROCESS")
+        self.assertEqual([k for k, v in self.attendee.participant_status_map.items() if v == 6][0], "COMPLETED")
 
     def test_008_default_rsvp(self):
         self.assertEqual(self.attendee.get_rsvp(), 0)
@@ -71,12 +71,12 @@
         self.assertEqual(self.attendee.rsvp_map["FALSE"], 0)
 
     def test_012_rsvp_map_reverse_lookup_boolean(self):
-        self.assertEqual([k for k, v in self.attendee.rsvp_map.iteritems() if v is True][0], "TRUE")
-        self.assertEqual([k for k, v in self.attendee.rsvp_map.iteritems() if v is False][0], "FALSE")
+        self.assertEqual([k for k, v in self.attendee.rsvp_map.items() if v is True][0], "TRUE")
+        self.assertEqual([k for k, v in self.attendee.rsvp_map.items() if v is False][0], "FALSE")
 
     def test_013_rsvp_map_reverse_lookup_integer(self):
-        self.assertEqual([k for k, v in self.attendee.rsvp_map.iteritems() if v == 1][0], "TRUE")
-        self.assertEqual([k for k, v in self.attendee.rsvp_map.iteritems() if v == 0][0], "FALSE")
+        self.assertEqual([k for k, v in self.attendee.rsvp_map.items() if v == 1][0], "TRUE")
+        self.assertEqual([k for k, v in self.attendee.rsvp_map.items() if v == 0][0], "FALSE")
 
     def test_014_default_role(self):
         self.assertEqual(self.attendee.get_role(), 0)
@@ -91,10 +91,10 @@
         self.assertEqual(self.attendee.role_map["NON-PARTICIPANT"], 3)
 
     def test_017_role_map_reverse_lookup(self):
-        self.assertEqual([k for k, v in self.attendee.role_map.iteritems() if v == 0][0], "REQ-PARTICIPANT")
-        self.assertEqual([k for k, v in self.attendee.role_map.iteritems() if v == 1][0], "CHAIR")
-        self.assertEqual([k for k, v in self.attendee.role_map.iteritems() if v == 2][0], "OPT-PARTICIPANT")
-        self.assertEqual([k for k, v in self.attendee.role_map.iteritems() if v == 3][0], "NON-PARTICIPANT")
+        self.assertEqual([k for k, v in self.attendee.role_map.items() if v == 0][0], "REQ-PARTICIPANT")
+        self.assertEqual([k for k, v in self.attendee.role_map.items() if v == 1][0], "CHAIR")
+        self.assertEqual([k for k, v in self.attendee.role_map.items() if v == 2][0], "OPT-PARTICIPANT")
+        self.assertEqual([k for k, v in self.attendee.role_map.items() if v == 3][0], "NON-PARTICIPANT")
 
     def test_015_cutype_map_length(self):
         self.assertEqual(len(self.attendee.cutype_map.keys()), 5)
@@ -107,11 +107,11 @@
         self.assertEqual(self.attendee.cutype_map["UNKNOWN"], kolabformat.CutypeUnknown)
 
     def test_017_cutype_map_reverse_lookup(self):
-        self.assertEqual([k for k, v in self.attendee.cutype_map.iteritems() if v == kolabformat.CutypeGroup][0], "GROUP")
-        self.assertEqual([k for k, v in self.attendee.cutype_map.iteritems() if v == kolabformat.CutypeIndividual][0], "INDIVIDUAL")
-        self.assertEqual([k for k, v in self.attendee.cutype_map.iteritems() if v == kolabformat.CutypeResource][0], "RESOURCE")
-        self.assertEqual([k for k, v in self.attendee.cutype_map.iteritems() if v == kolabformat.CutypeRoom][0], "ROOM")
-        self.assertEqual([k for k, v in self.attendee.cutype_map.iteritems() if v == kolabformat.CutypeUnknown][0], "UNKNOWN")
+        self.assertEqual([k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeGroup][0], "GROUP")
+        self.assertEqual([k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeIndividual][0], "INDIVIDUAL")
+        self.assertEqual([k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeResource][0], "RESOURCE")
+        self.assertEqual([k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeRoom][0], "ROOM")
+        self.assertEqual([k for k, v in self.attendee.cutype_map.items() if v == kolabformat.CutypeUnknown][0], "UNKNOWN")
 
     def test_018_partstat_label(self):
         self.assertEqual(participant_status_label('NEEDS-ACTION'), "Needs Action")
diff --git a/wallace/module_invitationpolicy.py b/wallace/module_invitationpolicy.py
--- a/wallace/module_invitationpolicy.py
+++ b/wallace/module_invitationpolicy.py
@@ -138,7 +138,7 @@
     'ACT_SAVE_AND_FORWARD':           ACT_SAVE_AND_FORWARD + COND_TYPE_EVENT,
 }
 
-policy_value_map = dict([(v &~ COND_TYPE_ALL, k) for (k, v) in policy_name_map.iteritems()])
+policy_value_map = dict([(v &~ COND_TYPE_ALL, k) for (k, v) in policy_name_map.items()])
 
 object_type_conditons = {
     'event': COND_TYPE_EVENT,
@@ -1243,7 +1243,7 @@
         if itip_comment is not None:
             roundup += "\n" + itip_comment
 
-        for status,attendees in partstats.iteritems():
+        for status,attendees in partstats.items():
             if len(attendees) > 0:
                 roundup += "\n" + participant_status_label(status) + ":\n\t" + "\n\t".join(attendees) + "\n"
     else:
diff --git a/wallace/module_signature.py b/wallace/module_signature.py
--- a/wallace/module_signature.py
+++ b/wallace/module_signature.py
@@ -163,7 +163,7 @@
     if not signature_html and not signature_text and signature_rules is not None:
         for signature_rule in signature_rules:
             try:
-                for attr, regex in signature_rule.iteritems():
+                for attr, regex in signature_rule.items():
                     if attr == "html":
                         if not os.path.exists(signature_rule['html']):
                             raise ValueError