diff --git a/Makefile b/Makefile index 8b2ae83f02..1473d1258b 100644 --- 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 index c62b2d3743..8e2e3353aa 100644 --- 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()