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)


Revert resource location
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/27539
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py	2010-06-14 02:42:47 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py	2010-06-14 17:56:28 +0000
@@ -322,8 +322,8 @@
         Load the list of Crosswalk and BibleGateway bibles.
         """
         #Load and store Crosswalk Bibles
-        filepath = os.path.join(AppLocation.get_section_data_path(
-            self.bibleplugin.settingsSection), u'resources')
+        filepath = AppLocation.get_directory(AppLocation.PluginsDir)
+        filepath = os.path.join(filepath, u'bibles', u'resources')
         try:
             self.web_bible_list[WebDownload.Crosswalk] = {}
             books_file = open(

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2010-06-14 02:42:47 +0000
+++ openlp/plugins/bibles/lib/http.py	2010-06-14 17:56:28 +0000
@@ -56,8 +56,8 @@
         """
         if HTTPBooks.cursor is None:
             filepath = os.path.join(
-                AppLocation.get_section_data_path(u'bibles'), u'resources',
-                u'httpbooks.sqlite')
+                AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
+                u'resources', u'httpbooks.sqlite')
             conn = sqlite3.connect(filepath)
             HTTPBooks.cursor = conn.cursor()
         return HTTPBooks.cursor

=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py	2010-06-14 02:42:47 +0000
+++ openlp/plugins/bibles/lib/osis.py	2010-06-14 17:56:28 +0000
@@ -68,8 +68,9 @@
         self.trans_regex = re.compile(r'<transChange(.*?)>(.*?)</transChange>')
         self.spaces_regex = re.compile(r'([ ]{2,})')
         self.books = {}
-        filepath = os.path.join(AppLocation.get_section_data_path(
-            self.bible_plugin.settingsSection), u'resources', u'osisbooks.csv')
+        filepath = os.path.join(
+            AppLocation.get_directory(AppLocation.PluginsDir), u'bibles',
+            u'resources', u'osisbooks.csv')
         fbibles = None
         try:
             fbibles = open(filepath, u'r')