← Back to branch summary

~trb143/openlp/bug-1516171-24

« back to all changes in this revision

Viewing changes to openlp/core/utils/__init__.py

  • Committer: Raoul Snyman
  • Author(s): Tomas Groth
  • Date: 2015-06-14 18:38:44 UTC
  • mfrom: (2543.1.14 bugfixes21)
  • Revision ID: raoul@snyman.info-20150614183844-wxfg3itu1zu9toiu
https://launchpad.net/bugs/1463703
https://launchpad.net/bugs/1420356
Fix path of presentation thumbnail when loading from service files. Fixes bug 1463703.
Fix PDF reader using wrong maindisplay size.
Fix log-traceback when trying to remove servicemanager files before eg. powerpoint has closed the files.
Improve network exception handling.
Fix timer that checks for presentation slide change, remove powerpoint event handler that did the same.
Hide the main impress window when loading a presentation, but make it visible for a moment when starting presentation. Fixes bug 1420356.
Improve the detection of powerpoints presentation window by only looking at the filename root.
Fix traceback when going live with presentation while blanked to desktop.
Set service_item.name to "images" for pdfs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/core/utils/__init__.py
24
24
"""
25
25
from datetime import datetime
26
26
from distutils.version import LooseVersion
 
27
from http.client import HTTPException
27
28
import logging
28
29
import locale
29
30
import os
414
415
            page = None
415
416
            if retries > CONNECTION_RETRIES:
416
417
                raise
 
418
        except socket.gaierror:
 
419
            log.exception('Socket gaierror: {}'.format(url))
 
420
            page = None
 
421
            if retries > CONNECTION_RETRIES:
 
422
                raise
417
423
        except ConnectionRefusedError:
418
424
            log.exception('ConnectionRefused: {}'.format(url))
419
425
            page = None
425
431
            page = None
426
432
            if retries > CONNECTION_RETRIES:
427
433
                raise
 
434
        except HTTPException:
 
435
            log.exception('HTTPException error: {}'.format(url))
 
436
            page = None
 
437
            if retries > CONNECTION_RETRIES:
 
438
                raise
428
439
        except:
429
440
            # Don't know what's happening, so reraise the original
430
441
            raise