Merge pull request ssrikanta#14 from ssrikanta/python3_fix

Fixes issue observed with report update in python3.6
rickykim93 · Feb 1, 2017 · 1cbc436 · 1cbc436
2 parents cf6978e + aeba805
commit 1cbc436
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -24,7 +24,12 @@ Release Notes
 
 * Added support to include markers in the excel report
 
-**1.2.1 (2017-01-3)**
+**1.2.1 (2017-01-31)**
 
 * Fix for the issue obserevd on python3.6
 * Fix for unicode related issues in python3.6
+
+
+**1.2.2 (2017-02-01)**
+
+* Fixes issue with report update method in python3.6
diff --git a/pytest_excel/pytest_excel.py b/pytest_excel/pytest_excel.py
@@ -74,7 +74,7 @@ def create_sheet(self, column_heading):
 
     def update_worksheet(self):
         for data in self.results:
-            for key, value in data.iteritems():
+            for key, value in data.items():
                 self.wsheet.cell(row=self.rc, column=list(data).index(key) + 1).value = value
             self.rc = self.rc + 1
 
@@ -187,7 +187,7 @@ def pytest_runtest_makereport(self, item, call):
         report = outcome.get_result()
         report.test_doc = item.obj.__doc__
         test_marker = []
-        for k, v in item.keywords.iteritems():
+        for k, v in item.keywords.items():
             if isinstance(v, MarkInfo):
                 test_marker.append(k)
         report.test_marker = ', '.join(test_marker)

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.2.1
+1.2.2