Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Sun Mar 24 13:52:12 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.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 pyqtSlot
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 
@@ -27,7 +29,7 @@
         @param bookmarksList list of bookmarks (list of strings)
         @param parent parent widget (QWidget)
         """
-        super().__init__(parent)
+        super(HgMergeDialog, self).__init__(parent)
         self.setupUi(self)
        
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)