raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

more FTW fixes

Browse Source
This commit is contained in:
Andreas Preikschat 2013-07-06 23:18:15 +02:00
parent 04bbeead56
commit 18c3574cfe
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/firsttimeform.py
View File

@ -303,9 +303,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
``url``
The URL of the file we want to download.
"""
site = urllib.urlopen(url)
site = urllib.request.urlopen(url)
meta = site.info()
return int(meta.getheaders("Content-Length")[0])
return int(meta.get("Content-Length"))
def _download_progress(self, count, block_size):
"""

3
openlp/plugins/songs/songsplugin.py
View File

@ -41,7 +41,6 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import Plugin, StringContent, UiStrings, build_icon, translate
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
from openlp.core.utils import get_filesystem_encoding
from openlp.core.utils.actions import ActionList
from openlp.plugins.songs.lib import clean_song, upgrade
from openlp.plugins.songs.lib.db import init_schema, Song
@ -263,7 +262,7 @@ class SongsPlugin(Plugin):
self.application.process_events()
self.on_tools_reindex_item_triggered()
self.application.process_events()
db_dir = unicode(os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
db_dir = os.path.join(gettempdir(), u'openlp')
if not os.path.exists(db_dir):
return
song_dbs = []