Merge lp:~canonical-platform-qa/uci-config/py3-items into lp:~canonical-ci-engineering/uci-config/trunk

[Leo Arias]

Use items instead of iteritems for py3 compatibility.

[lp:~canonical-platform-qa/uci-config/py3-items]

64. By Leo Arias on 2014-12-05

Update also iterkeys.

[Vincent Ladeuil (vila)]

Goodbye histerical raisins.

review: Approve

=== modified file 'uciconfig/stores.py'
--- uciconfig/stores.py	2014-01-17 10:53:15 +0000
+++ uciconfig/stores.py	2014-12-05 01:03:57 +0000
@@ -49,7 +49,7 @@
         return self.options.get(name, default)
 
     def iter_option_names(self):
-        for k in self.options.iterkeys():
+        for k in self.options.keys():
             yield k
 
     def __repr__(self):
@@ -96,7 +96,7 @@
 
         :param store: the store containing the section
         """
-        for k, expected in dirty.orig.iteritems():
+        for k, expected in dirty.orig.items():
             actual = dirty.get(k, _DeletedOption)
             if actual is _DeletedOption:
                 if k in self.options:
@@ -216,7 +216,7 @@
         # get_mutable_section() call below.
         self.unload()
         # Apply the changes from the preserved dirty sections
-        for section_id, dirty in dirty_sections.iteritems():
+        for section_id, dirty in dirty_sections.items():
             clean = self.get_mutable_section(section_id)
             clean.apply_changes(dirty, self)
         # Everything is clean now