Fix python3 errors.

apackeer · Aug 2, 2012 · 46b6207 · 46b6207
1 parent c71f48b
commit 46b6207
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ cipyflakes:
 	${PYFLAKES_IF_AVAILABLE} ${PYFLAKES_WHITELIST}
 
 citests:
-	nosetests ${CI_TESTS} -v --with-xunit --xunit-file=junit-report.xml
+	nosetests ${CI_TESTS} --with-xunit --xunit-file=junit-report.xml
 
 ci: citests cipyflakes
 

diff --git a/requests/models.py b/requests/models.py
@@ -340,9 +340,9 @@ def _encode_files(self, files):
             return None
 
         try:
-            fields = self.data.items()
+            fields = list(self.data.items())
         except AttributeError:
-            fields = dict(self.data).items()
+            fields = list(dict(self.data).items())
 
         if isinstance(files, dict):
             files = files.items()