Fixed a few porting bugs.

Sat, 16 Jan 2010 15:05:10 +0000

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 16 Jan 2010 15:05:10 +0000
changeset 65
ca6449ba4824
parent 64
283b4227dc96
child 66
b76663ec7438

Fixed a few porting bugs.

Helpviewer/CookieJar/CookieJar.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/subversion.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/CookieJar/CookieJar.py	Sat Jan 16 14:46:24 2010 +0000
+++ b/Helpviewer/CookieJar/CookieJar.py	Sat Jan 16 15:05:10 2010 +0000
@@ -150,7 +150,8 @@
         if self.__keepCookies == self.KeepUntilExit:
             self.setAllCookies([])
         
-        self.__filterTrackingCookies = Preferences.getHelp("FilterTrackingCookies")
+        self.__filterTrackingCookies = Preferences.toBool(
+            Preferences.getHelp("FilterTrackingCookies"))
         
         self.__loaded = True
         self.emit(SIGNAL("cookiesChanged()"))
@@ -180,7 +181,7 @@
         
         Preferences.setHelp("AcceptCookies", self.__acceptCookies)
         Preferences.setHelp("KeepCookiesUntil", self.__keepCookies)
-        Preferences.setHelp("FilterTrackingCookies", int(self.__filterTrackingCookies))
+        Preferences.setHelp("FilterTrackingCookies", self.__filterTrackingCookies)
     
     def __purgeOldCookies(self):
         """
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Jan 16 14:46:24 2010 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Sat Jan 16 15:05:10 2010 +0000
@@ -1122,14 +1122,14 @@
                 rev1 = "HEAD"
             else:
                 revision1 = \
-                    pysvn.Revision(pysvn.opt_revision_kind.number, int(urlrev1)[0])
+                    pysvn.Revision(pysvn.opt_revision_kind.number, int(urlrev1))
                 rev1 = urlrev1
             if urlrev2 in ["HEAD", "head"]:
                 revision2 = pysvn.Revision(pysvn.opt_revision_kind.head)
                 rev2 = "HEAD"
             else:
                 revision2 = \
-                    pysvn.Revision(pysvn.opt_revision_kind.number, int(urlrev2)[0])
+                    pysvn.Revision(pysvn.opt_revision_kind.number, int(urlrev2))
                 rev2 = urlrev2
             if not target:
                 url1 = name
@@ -2034,4 +2034,4 @@
         @param interval check interval for the monitor thread in seconds (integer)
         @return reference to the monitor thread (QThread)
         """
-        return SvnStatusMonitorThread(interval, project.ppath, self)
\ No newline at end of file
+        return SvnStatusMonitorThread(interval, project.ppath, self)
--- a/UI/UserInterface.py	Sat Jan 16 14:46:24 2010 +0000
+++ b/UI/UserInterface.py	Sat Jan 16 15:05:10 2010 +0000
@@ -5154,7 +5154,7 @@
             self.SAServer.shutdown()
             self.SAServer = None
         
-        Preferences.setGeometry("MainMaximized", int(self.isMaximized()))
+        Preferences.setGeometry("MainMaximized", self.isMaximized())
         if not self.isMaximized():
             Preferences.setGeometry("MainGeometry", self.saveGeometry())
         if self.layout == "FloatingWindows":      # floating windows
@@ -5546,4 +5546,4 @@
         if self.__startup:
             if Preferences.getGeometry("MainMaximized"):
                 self.setWindowState(Qt.WindowStates(Qt.WindowMaximized))
-            self.__startup = False
\ No newline at end of file
+            self.__startup = False
--- a/ViewManager/ViewManager.py	Sat Jan 16 14:46:24 2010 +0000
+++ b/ViewManager/ViewManager.py	Sat Jan 16 15:05:10 2010 +0000
@@ -4413,7 +4413,7 @@
         Private slot to set the automatic spell checking of all editors.
         """
         enabled = self.autoSpellCheckAct.isChecked()
-        Preferences.setEditor("AutoSpellCheckingEnabled", int(enabled))
+        Preferences.setEditor("AutoSpellCheckingEnabled", enabled)
         for editor in self.editors:
             editor.setAutoSpellChecking()
     
@@ -4811,4 +4811,4 @@
         Public method to get a reference to the APIs manager.
         @return the APIs manager object (eric5.QScintilla.APIsManager)
         """
-        return self.apisManager
\ No newline at end of file
+        return self.apisManager

eric ide

mercurial