Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/DjangoDumpdataDataDialog.py	Fri Jan 20 19:03:48 2017 +0100
+++ b/ProjectDjango/DjangoDumpdataDataDialog.py	Tue Mar 28 19:24:25 2017 +0200
@@ -67,6 +67,6 @@
         else:
             excl = []
         
-        format = self.formatCombo.itemData(self.formatCombo.currentIndex())
+        dumpFormat = self.formatCombo.itemData(self.formatCombo.currentIndex())
         
-        return appls, excl, format, self.indentationSpinBox.value()
+        return appls, excl, dumpFormat, self.indentationSpinBox.value()