diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 75f87aa65..3e902b368 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -64,7 +64,7 @@ class ThemeScreenshotThread(QtCore.QThread): filename = config.get(u'theme_%s' % theme, u'filename') screenshot = config.get(u'theme_%s' % theme, u'screenshot') urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot), - os.path.join(gettempdir(), u'openlp', screenshot)) + os.path.join(unicode(gettempdir()), u'openlp', screenshot)) item = QtGui.QListWidgetItem(title, self.parent().themesListWidget) item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename)) item.setCheckState(QtCore.Qt.Unchecked) @@ -114,7 +114,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): Set up display at start of theme edit. """ self.restart() - check_directory_exists(os.path.join(uniocde(gettempdir()), u'openlp')) + check_directory_exists(os.path.join(unicode(gettempdir()), u'openlp')) self.noInternetFinishButton.setVisible(False) # Check if this is a re-run of the wizard. self.hasRunWizard = Settings().value( @@ -304,7 +304,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): if item.data(QtCore.Qt.UserRole) == QtCore.QVariant(filename): break item.setIcon(build_icon( - os.path.join(gettempdir(), u'openlp', screenshot))) + os.path.join(unicode(gettempdir()), u'openlp', screenshot))) def _getFileSize(self, url): site = urllib.urlopen(url) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index 4013284e4..d0c4333f4 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -71,7 +71,7 @@ class BibleUpgradeForm(OpenLPWizard): self.suffix = u'.sqlite' self.settingsSection = u'bibles' self.path = AppLocation.get_section_data_path(self.settingsSection) - self.temp_dir = os.path.join(gettempdir(), u'openlp') + self.temp_dir = os.path.join(unicode(gettempdir()), u'openlp') self.files = self.manager.old_bible_databases self.success = {} self.newbibles = {} diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 468c02968..0beead20a 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -233,7 +233,7 @@ class SongsPlugin(Plugin): new songs into the database. """ self.onToolsReindexItemTriggered() - db_dir = unicode(os.path.join(gettempdir(), u'openlp')) + db_dir = unicode(os.path.join(unicode(gettempdir()), u'openlp')) if not os.path.exists(db_dir): return song_dbs = []