Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py

branch
Py2 comp.
changeset 2525
8b507a9a2d40
parent 2302
f29e9405c851
child 3057
10516539f238
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Mon Mar 25 03:11:06 2013 +0100
@@ -7,6 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """
 
+from __future__ import unicode_literals    # __IGNORE_WARNING__
+
 from PyQt4.QtCore import QRegExp
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 
@@ -27,7 +29,7 @@
         @param force flag indicating a forced merge (boolean)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(SvnMergeDialog, self).__init__(parent)
         self.setupUi(self)
        
         self.forceCheckBox.setChecked(force)

eric ide

mercurial