openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Make urlopen() parameters Python 2.5 compatible

Fix mainDisplay closing (also may be a Python 2.5 issue).
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/13523
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-10-17 13:29:01 +0000
+++ openlp/core/ui/mainwindow.py	2009-10-17 18:05:21 +0000
@@ -414,7 +414,6 @@
         plugins.
         """
         QtGui.QMainWindow.__init__(self)
-        self.closeEvent = self.onCloseEvent
         self.screenList = screens
         self.serviceNotSaved = False
         self.settingsmanager = SettingsManager(screens)
@@ -593,7 +592,7 @@
         self.RenderManager.update_display(screen_number)
         self.mainDisplay.setup(screen_number)
 
-    def onCloseEvent(self, event):
+    def closeEvent(self, event):
         """
         Hook to close the main window and display windows on exit
         """

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2009-10-14 18:29:06 +0000
+++ openlp/core/utils/__init__.py	2009-10-17 18:05:21 +0000
@@ -44,7 +44,7 @@
         req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
         req.add_header(u'User-Agent', u'OpenLP%s' % current_version)
         try:
-            handle = urllib2.urlopen(req, None, 1)
+            handle = urllib2.urlopen(req, None)
             html = handle.read()
             version_string = unicode(html).rstrip()
         except IOError, e: