Merge lp:~alisonken1/openlp/strings-plugins1 into lp:openlp
- strings-plugins1
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2667 |
Merged at revision: | 2667 |
Proposed branch: | lp:~alisonken1/openlp/strings-plugins1 |
Merge into: | lp:openlp |
Diff against target: |
1619 lines (+309/-201) 20 files modified
openlp/plugins/alerts/alertsplugin.py (+7/-3) openlp/plugins/alerts/lib/alertsmanager.py (+1/-1) openlp/plugins/alerts/lib/alertstab.py (+2/-1) openlp/plugins/bibles/forms/bibleimportform.py (+11/-4) openlp/plugins/bibles/forms/bibleupgradeform.py (+42/-28) openlp/plugins/bibles/forms/editbibledialog.py (+6/-3) openlp/plugins/bibles/forms/editbibleform.py (+8/-7) openlp/plugins/bibles/lib/csvbible.py (+7/-5) openlp/plugins/bibles/lib/db.py (+31/-29) openlp/plugins/bibles/lib/http.py (+51/-36) openlp/plugins/bibles/lib/manager.py (+21/-15) openlp/plugins/bibles/lib/mediaitem.py (+47/-31) openlp/plugins/bibles/lib/opensong.py (+7/-7) openlp/plugins/bibles/lib/osis.py (+5/-4) openlp/plugins/bibles/lib/sword.py (+3/-3) openlp/plugins/bibles/lib/upgrade.py (+5/-5) openlp/plugins/bibles/lib/versereferencelist.py (+14/-8) openlp/plugins/bibles/lib/zefania.py (+6/-5) tests/functional/openlp_core_lib/test_projectordb.py (+32/-3) tests/functional/openlp_plugins/bibles/test_http.py (+3/-3) |
To merge this branch: | bzr merge lp:~alisonken1/openlp/strings-plugins1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+295379@code.launchpad.net |
Commit message
Update strings to python3 format in plugins part 1
Description of the change
Update strings to python3 format in plugins part 1
- Convert strings in alert plugin
- Convert strings in bible plugin
- Update bible plugin test
- Update projectordb test
-------
lp:~alisonken1/openlp/strings-plugins1 (revision 2667)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
Raoul Snyman (raoul-snyman) : | # |
Preview Diff
1 | === modified file 'openlp/plugins/alerts/alertsplugin.py' |
2 | --- openlp/plugins/alerts/alertsplugin.py 2016-03-31 16:34:22 +0000 |
3 | +++ openlp/plugins/alerts/alertsplugin.py 2016-05-21 08:42:57 +0000 |
4 | @@ -88,6 +88,7 @@ |
5 | } |
6 | } |
7 | """ |
8 | +# TODO: Verify format() with variable templates |
9 | CSS = """ |
10 | #alert { |
11 | position: absolute; |
12 | @@ -244,6 +245,9 @@ |
13 | :param frame: The Web frame holding the page. |
14 | """ |
15 | align = VerticalType.Names[self.settings_tab.location] |
16 | - frame.evaluateJavaScript('update_css("%s", "%s", "%s", "%s", "%s")' % |
17 | - (align, self.settings_tab.font_face, self.settings_tab.font_size, |
18 | - self.settings_tab.font_color, self.settings_tab.background_color)) |
19 | + frame.evaluateJavaScript('update_css("{align}", "{face}", "{size}", "{color}", ' |
20 | + '"{background}")'.format(align=align, |
21 | + face=self.settings_tab.font_face, |
22 | + size=self.settings_tab.font_size, |
23 | + color=self.settings_tab.font_color, |
24 | + background=self.settings_tab.background_color)) |
25 | |
26 | === modified file 'openlp/plugins/alerts/lib/alertsmanager.py' |
27 | --- openlp/plugins/alerts/lib/alertsmanager.py 2015-12-31 22:46:06 +0000 |
28 | +++ openlp/plugins/alerts/lib/alertsmanager.py 2016-05-21 08:42:57 +0000 |
29 | @@ -62,7 +62,7 @@ |
30 | |
31 | :param text: The text to display |
32 | """ |
33 | - self.log_debug('display alert called %s' % text) |
34 | + self.log_debug('display alert called {text}'.format(text=text)) |
35 | if text: |
36 | self.alert_list.append(text) |
37 | if self.timer_id != 0: |
38 | |
39 | === modified file 'openlp/plugins/alerts/lib/alertstab.py' |
40 | --- openlp/plugins/alerts/lib/alertstab.py 2016-04-17 19:06:17 +0000 |
41 | +++ openlp/plugins/alerts/lib/alertstab.py 2016-05-21 08:42:57 +0000 |
42 | @@ -197,5 +197,6 @@ |
43 | font.setBold(True) |
44 | font.setPointSize(self.font_size) |
45 | self.font_preview.setFont(font) |
46 | - self.font_preview.setStyleSheet('background-color: %s; color: %s' % (self.background_color, self.font_color)) |
47 | + self.font_preview.setStyleSheet('background-color: {back}; color: {front}'.format(back=self.background_color, |
48 | + front=self.font_color)) |
49 | self.changed = True |
50 | |
51 | === modified file 'openlp/plugins/bibles/forms/bibleimportform.py' |
52 | --- openlp/plugins/bibles/forms/bibleimportform.py 2016-05-05 20:30:00 +0000 |
53 | +++ openlp/plugins/bibles/forms/bibleimportform.py 2016-05-21 08:42:57 +0000 |
54 | @@ -593,22 +593,27 @@ |
55 | """ |
56 | Show the file open dialog for the books CSV file. |
57 | """ |
58 | + # TODO: Verify format() with varible template |
59 | self.get_file_name( |
60 | - WizardStrings.OpenTypeFile % WizardStrings.CSV, self.csv_books_edit, 'last directory import', '%s (*.csv)' % |
61 | - translate('BiblesPlugin.ImportWizardForm', 'CSV File')) |
62 | + WizardStrings.OpenTypeFile % WizardStrings.CSV, |
63 | + self.csv_books_edit, |
64 | + 'last directory import', |
65 | + '{name} (*.csv)'.format(name=translate('BiblesPlugin.ImportWizardForm', 'CSV File'))) |
66 | |
67 | def on_csv_verses_browse_button_clicked(self): |
68 | """ |
69 | Show the file open dialog for the verses CSV file. |
70 | """ |
71 | + # TODO: Verify format() with variable template |
72 | self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.CSV, self.csv_verses_edit, |
73 | - 'last directory import', '%s (*.csv)' % |
74 | - translate('BiblesPlugin.ImportWizardForm', 'CSV File')) |
75 | + 'last directory import', |
76 | + '{name} (*.csv)'.format(name=translate('BiblesPlugin.ImportWizardForm', 'CSV File'))) |
77 | |
78 | def on_open_song_browse_button_clicked(self): |
79 | """ |
80 | Show the file open dialog for the OpenSong file. |
81 | """ |
82 | + # TODO: Verify format() with variable template |
83 | self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.OS, self.open_song_file_edit, |
84 | 'last directory import') |
85 | |
86 | @@ -616,6 +621,7 @@ |
87 | """ |
88 | Show the file open dialog for the Zefania file. |
89 | """ |
90 | + # TODO: Verify format() with variable template |
91 | self.get_file_name(WizardStrings.OpenTypeFile % WizardStrings.ZEF, self.zefania_file_edit, |
92 | 'last directory import') |
93 | |
94 | @@ -631,6 +637,7 @@ |
95 | self.web_progress_bar.setVisible(True) |
96 | self.web_progress_bar.setValue(0) |
97 | proxy_server = self.field('proxy_server') |
98 | + # TODO: Where does critical_error_message_box get %s string from? |
99 | for (download_type, extractor) in ((WebDownload.Crosswalk, CWExtract(proxy_server)), |
100 | (WebDownload.BibleGateway, BGExtract(proxy_server)), |
101 | (WebDownload.Bibleserver, BSExtract(proxy_server))): |
102 | |
103 | === modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py' |
104 | --- openlp/plugins/bibles/forms/bibleupgradeform.py 2016-04-22 18:25:57 +0000 |
105 | +++ openlp/plugins/bibles/forms/bibleupgradeform.py 2016-05-21 08:42:57 +0000 |
106 | @@ -209,7 +209,7 @@ |
107 | for number, filename in enumerate(self.files): |
108 | bible = OldBibleDB(self.media_item, path=self.path, file=filename[0]) |
109 | self.checkBox[number] = QtWidgets.QCheckBox(self.scrollAreaContents) |
110 | - self.checkBox[number].setObjectName('checkBox[%d]' % number) |
111 | + self.checkBox[number].setObjectName('checkBox[{count:d}]'.format(count=number)) |
112 | self.checkBox[number].setText(bible.get_name()) |
113 | self.checkBox[number].setCheckState(QtCore.Qt.Checked) |
114 | self.formLayout.addWidget(self.checkBox[number]) |
115 | @@ -364,7 +364,10 @@ |
116 | name = filename[1] |
117 | self.progress_label.setText( |
118 | translate('BiblesPlugin.UpgradeWizardForm', |
119 | - 'Upgrading Bible %s of %s: "%s"\nUpgrading ...') % (number + 1, max_bibles, name)) |
120 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
121 | + 'Upgrading ...').format(count=number + 1, |
122 | + total=max_bibles, |
123 | + name=name)) |
124 | self.new_bibles[number] = BibleDB(self.media_item, path=self.path, name=name, file=filename[0]) |
125 | self.new_bibles[number].register(self.plugin.upgrade_wizard) |
126 | metadata = old_bible.get_metadata() |
127 | @@ -394,17 +397,19 @@ |
128 | handler = BSExtract(proxy_server) |
129 | books = handler.get_books_from_http(meta_data['download_name']) |
130 | if not books: |
131 | - log.error('Upgrading books from %s - download name: "%s" failed' % ( |
132 | - meta_data['download_source'], meta_data['download_name'])) |
133 | + log.error('Upgrading books from {uri} - ' |
134 | + 'download name: "{name}" failed'.format(uri=meta_data['download_source'], |
135 | + name=meta_data['download_name'])) |
136 | self.new_bibles[number].session.close() |
137 | del self.new_bibles[number] |
138 | critical_error_message_box( |
139 | translate('BiblesPlugin.UpgradeWizardForm', 'Download Error'), |
140 | translate('BiblesPlugin.UpgradeWizardForm', |
141 | 'To upgrade your Web Bibles an Internet connection is required.')) |
142 | - self.increment_progress_bar(translate( |
143 | - 'BiblesPlugin.UpgradeWizardForm', 'Upgrading Bible %s of %s: "%s"\nFailed') % |
144 | - (number + 1, max_bibles, name), self.progress_bar.maximum() - self.progress_bar.value()) |
145 | + text = translate('BiblesPlugin.UpgradeWizardForm', |
146 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
147 | + 'Failed').format(count=number + 1, total=max_bibles, name=name) |
148 | + self.increment_progress_bar(text, self.progress_bar.maximum() - self.progress_bar.value()) |
149 | self.success[number] = False |
150 | continue |
151 | bible = BiblesResourcesDB.get_webbible( |
152 | @@ -416,12 +421,13 @@ |
153 | else: |
154 | language_id = self.new_bibles[number].get_language(name) |
155 | if not language_id: |
156 | - log.warning('Upgrading from "%s" failed' % filename[0]) |
157 | + log.warning('Upgrading from "{name}" failed'.format(name=filename[0])) |
158 | self.new_bibles[number].session.close() |
159 | del self.new_bibles[number] |
160 | self.increment_progress_bar( |
161 | translate('BiblesPlugin.UpgradeWizardForm', |
162 | - 'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name), |
163 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
164 | + 'Failed').format(count=number + 1, total=max_bibles, name=name), |
165 | self.progress_bar.maximum() - self.progress_bar.value()) |
166 | self.success[number] = False |
167 | continue |
168 | @@ -432,13 +438,15 @@ |
169 | break |
170 | self.increment_progress_bar( |
171 | translate('BiblesPlugin.UpgradeWizardForm', |
172 | - 'Upgrading Bible %s of %s: "%s"\nUpgrading %s ...') % |
173 | - (number + 1, max_bibles, name, book)) |
174 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
175 | + 'Upgrading {book} ...').format(count=number + 1, total=max_bibles, |
176 | + name=name, book=book)) |
177 | book_ref_id = self.new_bibles[number].\ |
178 | get_book_ref_id_by_name(book, len(books), language_id) |
179 | if not book_ref_id: |
180 | - log.warning('Upgrading books from %s - download name: "%s" aborted by user' % ( |
181 | - meta_data['download_source'], meta_data['download_name'])) |
182 | + log.warning('Upgrading books from {source} - download name: "{name}" ' |
183 | + 'aborted by user'.format(source=meta_data['download_source'], |
184 | + name=meta_data['download_name'])) |
185 | self.new_bibles[number].session.close() |
186 | del self.new_bibles[number] |
187 | self.success[number] = False |
188 | @@ -450,7 +458,7 @@ |
189 | if oldbook: |
190 | verses = old_bible.get_verses(oldbook['id']) |
191 | if not verses: |
192 | - log.warning('No verses found to import for book "%s"', book) |
193 | + log.warning('No verses found to import for book "{book}"'.format(book=book)) |
194 | continue |
195 | for verse in verses: |
196 | if self.stop_import_flag: |
197 | @@ -465,12 +473,13 @@ |
198 | if not language_id: |
199 | language_id = self.new_bibles[number].get_language(name) |
200 | if not language_id: |
201 | - log.warning('Upgrading books from "%s" failed' % name) |
202 | + log.warning('Upgrading books from "{name}" failed'.format(name=name)) |
203 | self.new_bibles[number].session.close() |
204 | del self.new_bibles[number] |
205 | self.increment_progress_bar( |
206 | translate('BiblesPlugin.UpgradeWizardForm', |
207 | - 'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name), |
208 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
209 | + 'Failed').format(count=number + 1, total=max_bibles, name=name), |
210 | self.progress_bar.maximum() - self.progress_bar.value()) |
211 | self.success[number] = False |
212 | continue |
213 | @@ -482,11 +491,12 @@ |
214 | break |
215 | self.increment_progress_bar( |
216 | translate('BiblesPlugin.UpgradeWizardForm', |
217 | - 'Upgrading Bible %s of %s: "%s"\nUpgrading %s ...') % |
218 | - (number + 1, max_bibles, name, book['name'])) |
219 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
220 | + 'Upgrading {book} ...').format(count=number + 1, total=max_bibles, |
221 | + name=name, book=book['name'])) |
222 | book_ref_id = self.new_bibles[number].get_book_ref_id_by_name(book['name'], len(books), language_id) |
223 | if not book_ref_id: |
224 | - log.warning('Upgrading books from %s " failed - aborted by user' % name) |
225 | + log.warning('Upgrading books from {name} " failed - aborted by user'.format(name=name)) |
226 | self.new_bibles[number].session.close() |
227 | del self.new_bibles[number] |
228 | self.success[number] = False |
229 | @@ -496,7 +506,7 @@ |
230 | book_details['testament_id']) |
231 | verses = old_bible.get_verses(book['id']) |
232 | if not verses: |
233 | - log.warning('No verses found to import for book "%s"', book['name']) |
234 | + log.warning('No verses found to import for book "{book}"'.format(book=book['name'])) |
235 | self.new_bibles[number].delete_book(db_book) |
236 | continue |
237 | for verse in verses: |
238 | @@ -510,14 +520,16 @@ |
239 | if not self.success.get(number, True): |
240 | self.increment_progress_bar( |
241 | translate('BiblesPlugin.UpgradeWizardForm', |
242 | - 'Upgrading Bible %s of %s: "%s"\nFailed') % (number + 1, max_bibles, name), |
243 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
244 | + 'Failed').format(count=number + 1, total=max_bibles, name=name), |
245 | self.progress_bar.maximum() - self.progress_bar.value()) |
246 | else: |
247 | self.success[number] = True |
248 | self.new_bibles[number].save_meta('name', name) |
249 | self.increment_progress_bar( |
250 | translate('BiblesPlugin.UpgradeWizardForm', |
251 | - 'Upgrading Bible %s of %s: "%s"\nComplete') % (number + 1, max_bibles, name)) |
252 | + 'Upgrading Bible {count} of {total}: "{name}"\n' |
253 | + 'Complete').format(count=number + 1, total=max_bibles, name=name)) |
254 | if number in self.new_bibles: |
255 | self.new_bibles[number].session.close() |
256 | # Close the last bible's connection if possible. |
257 | @@ -540,20 +552,22 @@ |
258 | # Copy not upgraded bible back. |
259 | shutil.move(os.path.join(self.temp_dir, filename[0]), self.path) |
260 | if failed_import > 0: |
261 | - failed_import_text = translate('BiblesPlugin.UpgradeWizardForm', ', %s failed') % failed_import |
262 | + failed_import_text = translate('BiblesPlugin.UpgradeWizardForm', |
263 | + ', {name} failed').format(name=failed_import) |
264 | else: |
265 | failed_import_text = '' |
266 | if successful_import > 0: |
267 | if self.includeWebBible: |
268 | self.progress_label.setText( |
269 | translate('BiblesPlugin.UpgradeWizardForm', |
270 | - 'Upgrading Bible(s): %(success)d successful%(failed_text)s\nPlease note that verses ' |
271 | - 'from Web Bibles will be downloaded on demand and so an Internet connection is required.') |
272 | - % {'success': successful_import, 'failed_text': failed_import_text}) |
273 | + 'Upgrading Bible(s): {count:d} successful{failed}\nPlease note that verses ' |
274 | + 'from Web Bibles will be downloaded on demand and so an Internet connection is required.' |
275 | + ).format(count=successful_import, failed=failed_import_text)) |
276 | else: |
277 | self.progress_label.setText( |
278 | - translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading Bible(s): %s successful%s') % ( |
279 | - successful_import, failed_import_text)) |
280 | + translate('BiblesPlugin.UpgradeWizardForm', |
281 | + 'Upgrading Bible(s): {count:d} successful{failed}').format(count=successful_import, |
282 | + failed=failed_import_text)) |
283 | else: |
284 | self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Upgrade failed.')) |
285 | # Remove temp directory. |
286 | |
287 | === modified file 'openlp/plugins/bibles/forms/editbibledialog.py' |
288 | --- openlp/plugins/bibles/forms/editbibledialog.py 2015-12-31 22:46:06 +0000 |
289 | +++ openlp/plugins/bibles/forms/editbibledialog.py 2016-05-21 08:42:57 +0000 |
290 | @@ -103,9 +103,11 @@ |
291 | self.book_name_edit = {} |
292 | for book in BiblesResourcesDB.get_books(): |
293 | self.book_name_label[book['abbreviation']] = QtWidgets.QLabel(self.book_name_widget) |
294 | - self.book_name_label[book['abbreviation']].setObjectName('book_name_label[%s]' % book['abbreviation']) |
295 | + self.book_name_label[book['abbreviation']].setObjectName( |
296 | + 'book_name_label[{name}]'.format(book=book['abbreviation'])) |
297 | self.book_name_edit[book['abbreviation']] = QtWidgets.QLineEdit(self.book_name_widget) |
298 | - self.book_name_edit[book['abbreviation']].setObjectName('book_name_edit[%s]' % book['abbreviation']) |
299 | + self.book_name_edit[book['abbreviation']].setObjectName( |
300 | + 'book_name_edit[{name}]'.format(name=book['abbreviation'])) |
301 | self.book_name_widget_layout.addRow( |
302 | self.book_name_label[book['abbreviation']], |
303 | self.book_name_edit[book['abbreviation']]) |
304 | @@ -148,4 +150,5 @@ |
305 | self.bible_tab_widget.indexOf(self.book_name_tab), |
306 | translate('SongsPlugin.EditBibleForm', 'Custom Book Names')) |
307 | for book in BiblesResourcesDB.get_books(): |
308 | - self.book_name_label[book['abbreviation']].setText('%s:' % str(self.book_names[book['abbreviation']])) |
309 | + self.book_name_label[book['abbreviation']].setText( |
310 | + '{text}:'.format(text=self.book_names[book['abbreviation']])) |
311 | |
312 | === modified file 'openlp/plugins/bibles/forms/editbibleform.py' |
313 | --- openlp/plugins/bibles/forms/editbibleform.py 2016-01-09 16:26:14 +0000 |
314 | +++ openlp/plugins/bibles/forms/editbibleform.py 2016-05-21 08:42:57 +0000 |
315 | @@ -39,7 +39,7 @@ |
316 | """ |
317 | Class to manage the editing of a bible |
318 | """ |
319 | - log.info('%s EditBibleForm loaded', __name__) |
320 | + log.info('{name} EditBibleForm loaded'.format(name=__name__)) |
321 | |
322 | def __init__(self, media_item, parent, manager): |
323 | """ |
324 | @@ -168,16 +168,17 @@ |
325 | self.book_name_edit[abbreviation].setFocus() |
326 | critical_error_message_box( |
327 | UiStrings().EmptyField, |
328 | - translate('BiblesPlugin.BibleEditForm', 'You need to specify a book name for "%s".') % |
329 | - self.book_names[abbreviation]) |
330 | + translate('BiblesPlugin.BibleEditForm', |
331 | + 'You need to specify a book name for "{text}".').format(text=self.book_names[abbreviation])) |
332 | return False |
333 | elif not book_regex.match(new_book_name): |
334 | self.book_name_edit[abbreviation].setFocus() |
335 | critical_error_message_box( |
336 | UiStrings().EmptyField, |
337 | translate('BiblesPlugin.BibleEditForm', |
338 | - 'The book name "%s" is not correct.\nNumbers can only be used at the beginning and must\nbe ' |
339 | - 'followed by one or more non-numeric characters.') % new_book_name) |
340 | + 'The book name "{name}" is not correct.\n' |
341 | + 'Numbers can only be used at the beginning and must\nbe ' |
342 | + 'followed by one or more non-numeric characters.').format(name=new_book_name)) |
343 | return False |
344 | for abbr, book in self.books.items(): |
345 | if book: |
346 | @@ -187,7 +188,7 @@ |
347 | self.book_name_edit[abbreviation].setFocus() |
348 | critical_error_message_box( |
349 | translate('BiblesPlugin.BibleEditForm', 'Duplicate Book Name'), |
350 | - translate('BiblesPlugin.BibleEditForm', 'The Book Name "%s" has been entered more than once.') |
351 | - % new_book_name) |
352 | + translate('BiblesPlugin.BibleEditForm', |
353 | + 'The Book Name "{name}" has been entered more than once.').format(name=new_book_name)) |
354 | return False |
355 | return True |
356 | |
357 | === modified file 'openlp/plugins/bibles/lib/csvbible.py' |
358 | --- openlp/plugins/bibles/lib/csvbible.py 2015-12-31 22:46:06 +0000 |
359 | +++ openlp/plugins/bibles/lib/csvbible.py 2016-05-21 08:42:57 +0000 |
360 | @@ -86,7 +86,7 @@ |
361 | success = True |
362 | language_id = self.get_language(bible_name) |
363 | if not language_id: |
364 | - log.error('Importing books from "%s" failed' % self.filename) |
365 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
366 | return False |
367 | books_file = None |
368 | book_list = {} |
369 | @@ -98,11 +98,11 @@ |
370 | for line in books_reader: |
371 | if self.stop_import_flag: |
372 | break |
373 | - self.wizard.increment_progress_bar(translate('BiblesPlugin.CSVBible', 'Importing books... %s') |
374 | - % line[2]) |
375 | + self.wizard.increment_progress_bar(translate('BiblesPlugin.CSVBible', |
376 | + 'Importing books... {text}').format(text=line[2])) |
377 | book_ref_id = self.get_book_ref_id_by_name(line[2], 67, language_id) |
378 | if not book_ref_id: |
379 | - log.error('Importing books from "%s" failed' % self.books_file) |
380 | + log.error('Importing books from "{name}" failed'.format(name=self.books_file)) |
381 | return False |
382 | book_details = BiblesResourcesDB.get_book_by_id(book_ref_id) |
383 | self.create_book(line[2], book_ref_id, book_details['testament_id']) |
384 | @@ -134,9 +134,11 @@ |
385 | if book_ptr != line_book: |
386 | book = self.get_book(line_book) |
387 | book_ptr = book.name |
388 | + # TODO: Check out this conversion in translations |
389 | self.wizard.increment_progress_bar( |
390 | translate('BiblesPlugin.CSVBible', |
391 | - 'Importing verses from %s...' % book.name, 'Importing verses from <book name>...')) |
392 | + 'Importing verses from {name}...'.format(name=book.name), |
393 | + 'Importing verses from <book name>...')) |
394 | self.session.commit() |
395 | verse_text = line[3] |
396 | self.create_verse(book.id, line[1], line[2], verse_text) |
397 | |
398 | === modified file 'openlp/plugins/bibles/lib/db.py' |
399 | --- openlp/plugins/bibles/lib/db.py 2016-04-05 17:30:20 +0000 |
400 | +++ openlp/plugins/bibles/lib/db.py 2016-05-21 08:42:57 +0000 |
401 | @@ -185,7 +185,7 @@ |
402 | :param testament: *Defaults to 1.* The testament_reference_id from |
403 | bibles_resources.sqlite of the testament this book belongs to. |
404 | """ |
405 | - log.debug('BibleDB.create_book("%s", "%s")' % (name, bk_ref_id)) |
406 | + log.debug('BibleDB.create_book("{name}", "{number}")'.format(name=name, number=bk_ref_id)) |
407 | book = Book.populate(name=name, book_reference_id=bk_ref_id, testament_reference_id=testament) |
408 | self.save_object(book) |
409 | return book |
410 | @@ -196,7 +196,7 @@ |
411 | |
412 | :param book: The book object |
413 | """ |
414 | - log.debug('BibleDB.update_book("%s")' % book.name) |
415 | + log.debug('BibleDB.update_book("{name}")'.format(name=book.name)) |
416 | return self.save_object(book) |
417 | |
418 | def delete_book(self, db_book): |
419 | @@ -205,7 +205,7 @@ |
420 | |
421 | :param db_book: The book object. |
422 | """ |
423 | - log.debug('BibleDB.delete_book("%s")' % db_book.name) |
424 | + log.debug('BibleDB.delete_book("{name}")'.format(name=db_book.name)) |
425 | if self.delete_object(Book, db_book.id): |
426 | return True |
427 | return False |
428 | @@ -219,7 +219,7 @@ |
429 | :param text_list: A dict of the verses to be inserted. The key is the verse number, and the value is the |
430 | verse text. |
431 | """ |
432 | - log.debug('BibleDBcreate_chapter("%s", "%s")' % (book_id, chapter)) |
433 | + log.debug('BibleDBcreate_chapter("{number}", "{chapter}")'.format(number=book_id, chapter=chapter)) |
434 | # Text list has book and chapter as first two elements of the array. |
435 | for verse_number, verse_text in text_list.items(): |
436 | verse = Verse.populate( |
437 | @@ -266,7 +266,7 @@ |
438 | """ |
439 | if not isinstance(value, str): |
440 | value = str(value) |
441 | - log.debug('BibleDB.save_meta("%s/%s")' % (key, value)) |
442 | + log.debug('BibleDB.save_meta("{key}/{val}")'.format(key=key, val=value)) |
443 | meta = self.get_object(BibleMeta, key) |
444 | if meta: |
445 | meta.value = value |
446 | @@ -280,7 +280,7 @@ |
447 | |
448 | :param book: The name of the book to return. |
449 | """ |
450 | - log.debug('BibleDB.get_book("%s")' % book) |
451 | + log.debug('BibleDB.get_book("{book}")'.format(book=book)) |
452 | return self.get_object_filtered(Book, Book.name.like(book + '%')) |
453 | |
454 | def get_books(self): |
455 | @@ -297,11 +297,11 @@ |
456 | |
457 | :param ref_id: The reference id of the book to return. |
458 | """ |
459 | - log.debug('BibleDB.get_book_by_book_ref_id("%s")' % ref_id) |
460 | + log.debug('BibleDB.get_book_by_book_ref_id("{ref}")'.format(ref=ref_id)) |
461 | return self.get_object_filtered(Book, Book.book_reference_id.like(ref_id)) |
462 | |
463 | def get_book_ref_id_by_name(self, book, maxbooks, language_id=None): |
464 | - log.debug('BibleDB.get_book_ref_id_by_name:("%s", "%s")' % (book, language_id)) |
465 | + log.debug('BibleDB.get_book_ref_id_by_name:("{book}", "{lang}")'.format(book=book, lang=language_id)) |
466 | book_id = None |
467 | if BiblesResourcesDB.get_book(book, True): |
468 | book_temp = BiblesResourcesDB.get_book(book, True) |
469 | @@ -327,13 +327,14 @@ |
470 | :param book: The name of the book, according to the selected language. |
471 | :param language_selection: The language selection the user has chosen in the settings section of the Bible. |
472 | """ |
473 | - log.debug('get_book_ref_id_by_localised_name("%s", "%s")' % (book, language_selection)) |
474 | + log.debug('get_book_ref_id_by_localised_name("{book}", "{lang}")'.format(book=book, lang=language_selection)) |
475 | from openlp.plugins.bibles.lib import LanguageSelection, BibleStrings |
476 | book_names = BibleStrings().BookNames |
477 | # escape reserved characters |
478 | book_escaped = book |
479 | for character in RESERVED_CHARACTERS: |
480 | book_escaped = book_escaped.replace(character, '\\' + character) |
481 | + # TODO: Verify regex patters before using format() |
482 | regex_book = re.compile('\s*%s\s*' % '\s*'.join( |
483 | book_escaped.split()), re.UNICODE | re.IGNORECASE) |
484 | if language_selection == LanguageSelection.Bible: |
485 | @@ -374,14 +375,14 @@ |
486 | [('35', 1, 1, 1), ('35', 2, 2, 3)] |
487 | :param show_error: |
488 | """ |
489 | - log.debug('BibleDB.get_verses("%s")' % reference_list) |
490 | + log.debug('BibleDB.get_verses("{ref}")'.format(ref=reference_list)) |
491 | verse_list = [] |
492 | book_error = False |
493 | for book_id, chapter, start_verse, end_verse in reference_list: |
494 | db_book = self.get_book_by_book_ref_id(book_id) |
495 | if db_book: |
496 | book_id = db_book.book_reference_id |
497 | - log.debug('Book name corrected to "%s"' % db_book.name) |
498 | + log.debug('Book name corrected to "{book}"'.format(book=db_book.name)) |
499 | if end_verse == -1: |
500 | end_verse = self.get_verse_count(book_id, chapter) |
501 | verses = self.session.query(Verse) \ |
502 | @@ -393,7 +394,7 @@ |
503 | .all() |
504 | verse_list.extend(verses) |
505 | else: |
506 | - log.debug('OpenLP failed to find book with id "%s"' % book_id) |
507 | + log.debug('OpenLP failed to find book with id "{book}"'.format(book=book_id)) |
508 | book_error = True |
509 | if book_error and show_error: |
510 | critical_error_message_box( |
511 | @@ -412,8 +413,9 @@ |
512 | contains spaces, it will split apart and AND'd on the list of |
513 | values. |
514 | """ |
515 | - log.debug('BibleDB.verse_search("%s")' % text) |
516 | + log.debug('BibleDB.verse_search("{text}")'.format(text=text)) |
517 | verses = self.session.query(Verse) |
518 | + # TODO: Find out what this is doing before converting to format() |
519 | if text.find(',') > -1: |
520 | keywords = ['%%%s%%' % keyword.strip() for keyword in text.split(',')] |
521 | or_clause = [Verse.text.like(keyword) for keyword in keywords] |
522 | @@ -431,7 +433,7 @@ |
523 | |
524 | :param book: The book object to get the chapter count for. |
525 | """ |
526 | - log.debug('BibleDB.get_chapter_count("%s")' % book.name) |
527 | + log.debug('BibleDB.get_chapter_count("{book}")'.format(book=book.name)) |
528 | count = self.session.query(func.max(Verse.chapter)).join(Book).filter( |
529 | Book.book_reference_id == book.book_reference_id).scalar() |
530 | if not count: |
531 | @@ -445,7 +447,7 @@ |
532 | :param book_ref_id: The book reference id. |
533 | :param chapter: The chapter to get the verse count for. |
534 | """ |
535 | - log.debug('BibleDB.get_verse_count("%s", "%s")' % (book_ref_id, chapter)) |
536 | + log.debug('BibleDB.get_verse_count("{ref}", "{chapter}")'.format(ref=book_ref_id, chapter=chapter)) |
537 | count = self.session.query(func.max(Verse.verse)).join(Book) \ |
538 | .filter(Book.book_reference_id == book_ref_id) \ |
539 | .filter(Verse.chapter == chapter) \ |
540 | @@ -551,7 +553,7 @@ |
541 | :param name: The name or abbreviation of the book. |
542 | :param lower: True if the comparison should be only lowercase |
543 | """ |
544 | - log.debug('BiblesResourcesDB.get_book("%s")' % name) |
545 | + log.debug('BiblesResourcesDB.get_book("{name}")'.format(name=name)) |
546 | if not isinstance(name, str): |
547 | name = str(name) |
548 | if lower: |
549 | @@ -580,7 +582,7 @@ |
550 | |
551 | :param string: The string to search for in the book names or abbreviations. |
552 | """ |
553 | - log.debug('BiblesResourcesDB.get_book_like("%s")' % string) |
554 | + log.debug('BiblesResourcesDB.get_book_like("{text}")'.format(text=string)) |
555 | if not isinstance(string, str): |
556 | name = str(string) |
557 | books = BiblesResourcesDB.run_sql( |
558 | @@ -605,7 +607,7 @@ |
559 | |
560 | :param book_id: The id of the book. |
561 | """ |
562 | - log.debug('BiblesResourcesDB.get_book_by_id("%s")' % book_id) |
563 | + log.debug('BiblesResourcesDB.get_book_by_id("{book}")'.format(book=book_id)) |
564 | if not isinstance(book_id, int): |
565 | book_id = int(book_id) |
566 | books = BiblesResourcesDB.run_sql( |
567 | @@ -629,7 +631,7 @@ |
568 | :param book_ref_id: The id of a book. |
569 | :param chapter: The chapter number. |
570 | """ |
571 | - log.debug('BiblesResourcesDB.get_chapter("%s", "%s")' % (book_ref_id, chapter)) |
572 | + log.debug('BiblesResourcesDB.get_chapter("{book}", "{ref}")'.format(book=book_ref_id, ref=chapter)) |
573 | if not isinstance(chapter, int): |
574 | chapter = int(chapter) |
575 | chapters = BiblesResourcesDB.run_sql( |
576 | @@ -652,7 +654,7 @@ |
577 | |
578 | :param book_ref_id: The id of the book. |
579 | """ |
580 | - log.debug('BiblesResourcesDB.get_chapter_count("%s")' % book_ref_id) |
581 | + log.debug('BiblesResourcesDB.get_chapter_count("{ref}")'.format(ref=book_ref_id)) |
582 | details = BiblesResourcesDB.get_book_by_id(book_ref_id) |
583 | if details: |
584 | return details['chapters'] |
585 | @@ -666,7 +668,7 @@ |
586 | :param book_ref_id: The id of the book. |
587 | :param chapter: The number of the chapter. |
588 | """ |
589 | - log.debug('BiblesResourcesDB.get_verse_count("%s", "%s")' % (book_ref_id, chapter)) |
590 | + log.debug('BiblesResourcesDB.get_verse_count("{ref}", "{chapter}")'.format(ref=book_ref_id, chapter=chapter)) |
591 | details = BiblesResourcesDB.get_chapter(book_ref_id, chapter) |
592 | if details: |
593 | return details['verse_count'] |
594 | @@ -679,7 +681,7 @@ |
595 | |
596 | :param source: The name or abbreviation of the book. |
597 | """ |
598 | - log.debug('BiblesResourcesDB.get_download_source("%s")' % source) |
599 | + log.debug('BiblesResourcesDB.get_download_source("{source}")'.format(source=source)) |
600 | if not isinstance(source, str): |
601 | source = str(source) |
602 | source = source.title() |
603 | @@ -700,7 +702,7 @@ |
604 | |
605 | :param source: The source of the web_bible. |
606 | """ |
607 | - log.debug('BiblesResourcesDB.get_webbibles("%s")' % source) |
608 | + log.debug('BiblesResourcesDB.get_webbibles("{source}")'.format(source=source)) |
609 | if not isinstance(source, str): |
610 | source = str(source) |
611 | source = BiblesResourcesDB.get_download_source(source) |
612 | @@ -725,7 +727,7 @@ |
613 | :param abbreviation: The abbreviation of the web_bible. |
614 | :param source: The source of the web_bible. |
615 | """ |
616 | - log.debug('BiblesResourcesDB.get_webbibles("%s", "%s")' % (abbreviation, source)) |
617 | + log.debug('BiblesResourcesDB.get_webbibles("{text}", "{source}")'.format(text=abbreviation, source=source)) |
618 | if not isinstance(abbreviation, str): |
619 | abbreviation = str(abbreviation) |
620 | if not isinstance(source, str): |
621 | @@ -753,7 +755,7 @@ |
622 | :param name: The name to search the id. |
623 | :param language_id: The language_id for which language should be searched |
624 | """ |
625 | - log.debug('BiblesResourcesDB.get_alternative_book_name("%s", "%s")' % (name, language_id)) |
626 | + log.debug('BiblesResourcesDB.get_alternative_book_name("{name}", "{lang}")'.format(name=name, lang=language_id)) |
627 | if language_id: |
628 | books = BiblesResourcesDB.run_sql( |
629 | 'SELECT book_reference_id, name FROM alternative_book_names WHERE language_id = ? ORDER BY id', |
630 | @@ -772,7 +774,7 @@ |
631 | |
632 | :param name: The name or abbreviation of the language. |
633 | """ |
634 | - log.debug('BiblesResourcesDB.get_language("%s")' % name) |
635 | + log.debug('BiblesResourcesDB.get_language("{name}")'.format(name=name)) |
636 | if not isinstance(name, str): |
637 | name = str(name) |
638 | language = BiblesResourcesDB.run_sql( |
639 | @@ -868,7 +870,7 @@ |
640 | :param name: The name to search the id. |
641 | :param language_id: The language_id for which language should be searched |
642 | """ |
643 | - log.debug('AlternativeBookNamesDB.get_book_reference_id("%s", "%s")' % (name, language_id)) |
644 | + log.debug('AlternativeBookNamesDB.get_book_reference_id("{name}", "{ref}")'.format(name=name, ref=language_id)) |
645 | if language_id: |
646 | books = AlternativeBookNamesDB.run_sql( |
647 | 'SELECT book_reference_id, name FROM alternative_book_names WHERE language_id = ?', (language_id, )) |
648 | @@ -889,8 +891,8 @@ |
649 | :param book_reference_id: The book_reference_id of the book. |
650 | :param language_id: The language to which the alternative book name belong. |
651 | """ |
652 | - log.debug('AlternativeBookNamesDB.create_alternative_book_name("%s", "%s", "%s")' % |
653 | - (name, book_reference_id, language_id)) |
654 | + log.debug('AlternativeBookNamesDB.create_alternative_book_name("{name}", ' |
655 | + '"{ref}", "{lang}")'.format(name=name, ref=book_reference_id, lang=language_id)) |
656 | return AlternativeBookNamesDB.run_sql( |
657 | 'INSERT INTO alternative_book_names(book_reference_id, language_id, name) ' |
658 | 'VALUES (?, ?, ?)', (book_reference_id, language_id, name), True) |
659 | |
660 | === modified file 'openlp/plugins/bibles/lib/http.py' |
661 | --- openlp/plugins/bibles/lib/http.py 2016-05-06 05:33:43 +0000 |
662 | +++ openlp/plugins/bibles/lib/http.py 2016-05-21 08:42:57 +0000 |
663 | @@ -90,7 +90,7 @@ |
664 | Extract verses from BibleGateway |
665 | """ |
666 | def __init__(self, proxy_url=None): |
667 | - log.debug('BGExtract.init("%s")', proxy_url) |
668 | + log.debug('BGExtract.init("{url}")'.format(url=proxy_url)) |
669 | self.proxy_url = proxy_url |
670 | socket.setdefaulttimeout(30) |
671 | |
672 | @@ -188,7 +188,7 @@ |
673 | if len(verse_parts) > 1: |
674 | verse = int(verse_parts[0]) |
675 | except TypeError: |
676 | - log.warning('Illegal verse number: %s', str(verse)) |
677 | + log.warning('Illegal verse number: {verse:d}'.format(verse=verse)) |
678 | verses.append((verse, text)) |
679 | verse_list = {} |
680 | for verse, text in verses[::-1]: |
681 | @@ -221,7 +221,7 @@ |
682 | if len(verse_parts) > 1: |
683 | clean_verse_num = int(verse_parts[0]) |
684 | except TypeError: |
685 | - log.warning('Illegal verse number: %s', str(raw_verse_num)) |
686 | + log.warning('Illegal verse number: {verse:d}'.format(verse=raw_verse_num)) |
687 | if clean_verse_num: |
688 | verse_text = raw_verse_num.next_element |
689 | part = raw_verse_num.next_element.next_element |
690 | @@ -244,11 +244,15 @@ |
691 | :param book_name: Name of the Book. |
692 | :param chapter: Chapter number. |
693 | """ |
694 | - log.debug('BGExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter) |
695 | + log.debug('BGExtract.get_bible_chapter("{version}", "{name}", "{chapter}")'.format(version=version, |
696 | + name=book_name, |
697 | + chapter=chapter)) |
698 | url_book_name = urllib.parse.quote(book_name.encode("utf-8")) |
699 | - url_params = 'search=%s+%s&version=%s' % (url_book_name, chapter, version) |
700 | + url_params = 'search={name}+{chapter}&version={version}'.format(name=url_book_name, |
701 | + chapter=chapter, |
702 | + version=version) |
703 | soup = get_soup_for_bible_ref( |
704 | - 'http://legacy.biblegateway.com/passage/?%s' % url_params, |
705 | + 'http://legacy.biblegateway.com/passage/?{url}'.format(url=url_params), |
706 | pre_parse_regex=r'<meta name.*?/>', pre_parse_substitute='') |
707 | if not soup: |
708 | return None |
709 | @@ -257,7 +261,7 @@ |
710 | return None |
711 | self._clean_soup(div) |
712 | span_list = div.find_all('span', 'text') |
713 | - log.debug('Span list: %s', span_list) |
714 | + log.debug('Span list: {span}'.format(span=span_list)) |
715 | if not span_list: |
716 | # If we don't get any spans then we must have the old HTML format |
717 | verse_list = self._extract_verses_old(div) |
718 | @@ -275,9 +279,9 @@ |
719 | |
720 | :param version: The version of the Bible like NIV for New International Version |
721 | """ |
722 | - log.debug('BGExtract.get_books_from_http("%s")', version) |
723 | - url_params = urllib.parse.urlencode({'action': 'getVersionInfo', 'vid': '%s' % version}) |
724 | - reference_url = 'http://legacy.biblegateway.com/versions/?%s#books' % url_params |
725 | + log.debug('BGExtract.get_books_from_http("{version}")'.format(version=version)) |
726 | + url_params = urllib.parse.urlencode({'action': 'getVersionInfo', 'vid': '{version}'.format(version=version)}) |
727 | + reference_url = 'http://legacy.biblegateway.com/versions/?{url}#books'.format(url=url_params) |
728 | page = get_web_page(reference_url) |
729 | if not page: |
730 | send_error_message('download') |
731 | @@ -353,7 +357,7 @@ |
732 | Extract verses from Bibleserver.com |
733 | """ |
734 | def __init__(self, proxy_url=None): |
735 | - log.debug('BSExtract.init("%s")', proxy_url) |
736 | + log.debug('BSExtract.init("{url}")'.format(url=proxy_url)) |
737 | self.proxy_url = proxy_url |
738 | socket.setdefaulttimeout(30) |
739 | |
740 | @@ -365,10 +369,14 @@ |
741 | :param book_name: Text name of bible book e.g. Genesis, 1. John, 1John or Offenbarung |
742 | :param chapter: Chapter number |
743 | """ |
744 | - log.debug('BSExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter) |
745 | + log.debug('BSExtract.get_bible_chapter("{version}", "{book}", "{chapter}")'.format(version=version, |
746 | + book=book_name, |
747 | + chapter=chapter)) |
748 | url_version = urllib.parse.quote(version.encode("utf-8")) |
749 | url_book_name = urllib.parse.quote(book_name.encode("utf-8")) |
750 | - chapter_url = 'http://m.bibleserver.com/text/%s/%s%d' % (url_version, url_book_name, chapter) |
751 | + chapter_url = 'http://m.bibleserver.com/text/{version}/{name}{chapter:d}'.format(version=url_version, |
752 | + name=url_book_name, |
753 | + chapter=chapter) |
754 | header = ('Accept-Language', 'en') |
755 | soup = get_soup_for_bible_ref(chapter_url, header) |
756 | if not soup: |
757 | @@ -393,9 +401,9 @@ |
758 | |
759 | :param version: The version of the Bible like NIV for New International Version |
760 | """ |
761 | - log.debug('BSExtract.get_books_from_http("%s")', version) |
762 | + log.debug('BSExtract.get_books_from_http("{version}")'.format(version=version)) |
763 | url_version = urllib.parse.quote(version.encode("utf-8")) |
764 | - chapter_url = 'http://m.bibleserver.com/overlay/selectBook?translation=%s' % url_version |
765 | + chapter_url = 'http://m.bibleserver.com/overlay/selectBook?translation={version}'.format(version=url_version) |
766 | soup = get_soup_for_bible_ref(chapter_url) |
767 | if not soup: |
768 | return None |
769 | @@ -450,7 +458,7 @@ |
770 | Extract verses from CrossWalk/BibleStudyTools |
771 | """ |
772 | def __init__(self, proxy_url=None): |
773 | - log.debug('CWExtract.init("%s")', proxy_url) |
774 | + log.debug('CWExtract.init("{url}")'.format(url=proxy_url)) |
775 | self.proxy_url = proxy_url |
776 | socket.setdefaulttimeout(30) |
777 | |
778 | @@ -462,11 +470,15 @@ |
779 | :param book_name: Text name of in english e.g. 'gen' for Genesis |
780 | :param chapter: Chapter number |
781 | """ |
782 | - log.debug('CWExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter) |
783 | + log.debug('CWExtract.get_bible_chapter("{version}", "{book}", "{chapter}")'.format(version=version, |
784 | + book=book_name, |
785 | + chapter=chapter)) |
786 | url_book_name = book_name.replace(' ', '-') |
787 | url_book_name = url_book_name.lower() |
788 | url_book_name = urllib.parse.quote(url_book_name.encode("utf-8")) |
789 | - chapter_url = 'http://www.biblestudytools.com/%s/%s/%s.html' % (version, url_book_name, chapter) |
790 | + chapter_url = 'http://www.biblestudytools.com/{version}/{book}/{chapter}.html'.format(version=version, |
791 | + book=url_book_name, |
792 | + chapter=chapter) |
793 | soup = get_soup_for_bible_ref(chapter_url) |
794 | if not soup: |
795 | return None |
796 | @@ -499,8 +511,8 @@ |
797 | |
798 | :param version: The version of the bible like NIV for New International Version |
799 | """ |
800 | - log.debug('CWExtract.get_books_from_http("%s")', version) |
801 | - chapter_url = 'http://www.biblestudytools.com/%s/' % version |
802 | + log.debug('CWExtract.get_books_from_http("{version}")'.format(version=version)) |
803 | + chapter_url = 'http://www.biblestudytools.com/{version}/'.format(version=version) |
804 | soup = get_soup_for_bible_ref(chapter_url) |
805 | if not soup: |
806 | return None |
807 | @@ -559,7 +571,7 @@ |
808 | |
809 | |
810 | class HTTPBible(BibleDB, RegistryProperties): |
811 | - log.info('%s HTTPBible loaded', __name__) |
812 | + log.info('{name} HTTPBible loaded'.format(name=__name__)) |
813 | |
814 | def __init__(self, parent, **kwargs): |
815 | """ |
816 | @@ -615,8 +627,8 @@ |
817 | handler = BSExtract(self.proxy_server) |
818 | books = handler.get_books_from_http(self.download_name) |
819 | if not books: |
820 | - log.error('Importing books from %s - download name: "%s" failed' % |
821 | - (self.download_source, self.download_name)) |
822 | + log.error('Importing books from {source} - download name: "{name}" ' |
823 | + 'failed'.format(source=self.download_source, name=self.download_name)) |
824 | return False |
825 | self.wizard.progress_bar.setMaximum(len(books) + 2) |
826 | self.wizard.increment_progress_bar(translate('BiblesPlugin.HTTPBible', 'Registering Language...')) |
827 | @@ -625,21 +637,24 @@ |
828 | else: |
829 | self.language_id = self.get_language(bible_name) |
830 | if not self.language_id: |
831 | - log.error('Importing books from %s failed' % self.filename) |
832 | + log.error('Importing books from {name} failed'.format(name=self.filename)) |
833 | return False |
834 | for book in books: |
835 | if self.stop_import_flag: |
836 | break |
837 | - self.wizard.increment_progress_bar(translate( |
838 | - 'BiblesPlugin.HTTPBible', 'Importing %s...', 'Importing <book name>...') % book) |
839 | + self.wizard.increment_progress_bar(translate('BiblesPlugin.HTTPBible', |
840 | + 'Importing {book}...', |
841 | + 'Importing <book name>...').format(book=book)) |
842 | book_ref_id = self.get_book_ref_id_by_name(book, len(books), self.language_id) |
843 | if not book_ref_id: |
844 | - log.error('Importing books from %s - download name: "%s" failed' % |
845 | - (self.download_source, self.download_name)) |
846 | + log.error('Importing books from {source} - download name: "{name}" ' |
847 | + 'failed'.format(source=self.download_source, name=self.download_name)) |
848 | return False |
849 | book_details = BiblesResourcesDB.get_book_by_id(book_ref_id) |
850 | - log.debug('Book details: Name:%s; id:%s; testament_id:%s', |
851 | - book, book_ref_id, book_details['testament_id']) |
852 | + log.debug('Book details: Name:{book}; id:{ref}; ' |
853 | + 'testament_id:{detail}'.format(book=book, |
854 | + ref=book_ref_id, |
855 | + detail=book_details['testament_id'])) |
856 | self.create_book(book, book_ref_id, book_details['testament_id']) |
857 | if self.stop_import_flag: |
858 | return False |
859 | @@ -664,7 +679,7 @@ |
860 | |
861 | [('35', 1, 1, 1), ('35', 2, 2, 3)] |
862 | """ |
863 | - log.debug('HTTPBible.get_verses("%s")', reference_list) |
864 | + log.debug('HTTPBible.get_verses("{ref}")'.format(ref=reference_list)) |
865 | for reference in reference_list: |
866 | book_id = reference[0] |
867 | db_book = self.get_book_by_book_ref_id(book_id) |
868 | @@ -698,8 +713,8 @@ |
869 | """ |
870 | Receive the request and call the relevant handler methods. |
871 | """ |
872 | - log.debug('HTTPBible.get_chapter("%s", "%s")', book, chapter) |
873 | - log.debug('source = %s', self.download_source) |
874 | + log.debug('HTTPBible.get_chapter("{book}", "{chapter}")'.format(book=book, chapter=chapter)) |
875 | + log.debug('source = {source}'.format(source=self.download_source)) |
876 | if self.download_source.lower() == 'crosswalk': |
877 | handler = CWExtract(self.proxy_server) |
878 | elif self.download_source.lower() == 'biblegateway': |
879 | @@ -712,7 +727,7 @@ |
880 | """ |
881 | Return the list of books. |
882 | """ |
883 | - log.debug('HTTPBible.get_books("%s")', Book.name) |
884 | + log.debug('HTTPBible.get_books("{name}")'.format(name=Book.name)) |
885 | return self.get_all_objects(Book, order_by_ref=Book.id) |
886 | |
887 | def get_chapter_count(self, book): |
888 | @@ -721,7 +736,7 @@ |
889 | |
890 | :param book: The book object to get the chapter count for. |
891 | """ |
892 | - log.debug('HTTPBible.get_chapter_count("%s")', book.name) |
893 | + log.debug('HTTPBible.get_chapter_count("{name}")'.format(name=book.name)) |
894 | return BiblesResourcesDB.get_chapter_count(book.book_reference_id) |
895 | |
896 | def get_verse_count(self, book_id, chapter): |
897 | @@ -731,7 +746,7 @@ |
898 | :param book_id: The name of the book. |
899 | :param chapter: The chapter whose verses are being counted. |
900 | """ |
901 | - log.debug('HTTPBible.get_verse_count("%s", %s)', book_id, chapter) |
902 | + log.debug('HTTPBible.get_verse_count("{ref}", {chapter})'.format(ref=book_id, chapter=chapter)) |
903 | return BiblesResourcesDB.get_verse_count(book_id, chapter) |
904 | |
905 | |
906 | |
907 | === modified file 'openlp/plugins/bibles/lib/manager.py' |
908 | --- openlp/plugins/bibles/lib/manager.py 2016-04-12 20:05:58 +0000 |
909 | +++ openlp/plugins/bibles/lib/manager.py 2016-05-21 08:42:57 +0000 |
910 | @@ -122,7 +122,7 @@ |
911 | files = AppLocation.get_files(self.settings_section, self.suffix) |
912 | if 'alternative_book_names.sqlite' in files: |
913 | files.remove('alternative_book_names.sqlite') |
914 | - log.debug('Bible Files %s', files) |
915 | + log.debug('Bible Files {text}'.format(text=files)) |
916 | self.db_cache = {} |
917 | self.old_bible_databases = [] |
918 | for filename in files: |
919 | @@ -135,7 +135,7 @@ |
920 | bible.session.close() |
921 | delete_file(os.path.join(self.path, filename)) |
922 | continue |
923 | - log.debug('Bible Name: "%s"', name) |
924 | + log.debug('Bible Name: "{name}"'.format(name=name)) |
925 | self.db_cache[name] = bible |
926 | # Look to see if lazy load bible exists and get create getter. |
927 | source = self.db_cache[name].get_object(BibleMeta, 'download_source') |
928 | @@ -177,7 +177,7 @@ |
929 | |
930 | :param name: The name of the bible. |
931 | """ |
932 | - log.debug('BibleManager.delete_bible("%s")', name) |
933 | + log.debug('BibleManager.delete_bible("{name}")'.format(name=name)) |
934 | bible = self.db_cache[name] |
935 | bible.session.close() |
936 | bible.session = None |
937 | @@ -196,7 +196,7 @@ |
938 | |
939 | :param bible: Unicode. The Bible to get the list of books from. |
940 | """ |
941 | - log.debug('BibleManager.get_books("%s")', bible) |
942 | + log.debug('BibleManager.get_books("{bible}")'.format(bible=bible)) |
943 | return [ |
944 | { |
945 | 'name': book.name, |
946 | @@ -213,7 +213,7 @@ |
947 | :param bible: Unicode. The Bible to get the list of books from. |
948 | :param id: Unicode. The book_reference_id to get the book for. |
949 | """ |
950 | - log.debug('BibleManager.get_book_by_id("%s", "%s")', bible, id) |
951 | + log.debug('BibleManager.get_book_by_id("{bible}", "{ref}")'.format(bible=bible, ref=id)) |
952 | return self.db_cache[bible].get_book_by_book_ref_id(id) |
953 | |
954 | def get_chapter_count(self, bible, book): |
955 | @@ -223,14 +223,16 @@ |
956 | :param bible: Unicode. The Bible to get the list of books from. |
957 | :param book: The book object to get the chapter count for. |
958 | """ |
959 | - log.debug('BibleManager.get_book_chapter_count ("%s", "%s")', bible, book.name) |
960 | + log.debug('BibleManager.get_book_chapter_count ("{bible}", "{name}")'.format(bible=bible, name=book.name)) |
961 | return self.db_cache[bible].get_chapter_count(book) |
962 | |
963 | def get_verse_count(self, bible, book, chapter): |
964 | """ |
965 | Returns all the number of verses for a given book and chapterMaxBibleBookVerses. |
966 | """ |
967 | - log.debug('BibleManager.get_verse_count("%s", "%s", %s)', bible, book, chapter) |
968 | + log.debug('BibleManager.get_verse_count("{bible}", "{book}", {chapter})'.format(bible=bible, |
969 | + book=book, |
970 | + chapter=chapter)) |
971 | language_selection = self.get_language_selection(bible) |
972 | book_ref_id = self.db_cache[bible].get_book_ref_id_by_localised_name(book, language_selection) |
973 | return self.db_cache[bible].get_verse_count(book_ref_id, chapter) |
974 | @@ -240,7 +242,8 @@ |
975 | Returns all the number of verses for a given |
976 | book_ref_id and chapterMaxBibleBookVerses. |
977 | """ |
978 | - log.debug('BibleManager.get_verse_count_by_book_ref_id("%s", "%s", "%s")', bible, book_ref_id, chapter) |
979 | + log.debug('BibleManager.get_verse_count_by_book_ref_id("{bible}", ' |
980 | + '"{book}", "{chapter}")'.format(bible=bible, book=book_ref_id, chapter=chapter)) |
981 | return self.db_cache[bible].get_verse_count(book_ref_id, chapter) |
982 | |
983 | def get_verses(self, bible, verse_text, book_ref_id=False, show_error=True): |
984 | @@ -264,7 +267,7 @@ |
985 | For second bible this is necessary. |
986 | :param show_error: |
987 | """ |
988 | - log.debug('BibleManager.get_verses("%s", "%s")', bible, verse_text) |
989 | + log.debug('BibleManager.get_verses("{bible}", "{verse}")'.format(bible=bible, verse=verse_text)) |
990 | if not bible: |
991 | if show_error: |
992 | self.main_window.information_message( |
993 | @@ -308,7 +311,7 @@ |
994 | |
995 | :param bible: Unicode. The Bible to get the language selection from. |
996 | """ |
997 | - log.debug('BibleManager.get_language_selection("%s")', bible) |
998 | + log.debug('BibleManager.get_language_selection("{bible}")'.format(bible=bible)) |
999 | language_selection = self.get_meta_data(bible, 'book_name_language') |
1000 | if not language_selection or language_selection.value == "None" or language_selection.value == "-1": |
1001 | # If None is returned, it's not the singleton object but a |
1002 | @@ -330,7 +333,7 @@ |
1003 | :param second_bible: The second bible (unicode). We do not search in this bible. |
1004 | :param text: The text to search for (unicode). |
1005 | """ |
1006 | - log.debug('BibleManager.verse_search("%s", "%s")', bible, text) |
1007 | + log.debug('BibleManager.verse_search("{bible}", "{text}")'.format(bible=bible, text=text)) |
1008 | if not bible: |
1009 | self.main_window.information_message( |
1010 | translate('BiblesPlugin.BibleManager', 'No Bibles Available'), |
1011 | @@ -365,7 +368,10 @@ |
1012 | """ |
1013 | Saves the bibles meta data. |
1014 | """ |
1015 | - log.debug('save_meta data %s, %s, %s, %s', bible, version, copyright, permissions) |
1016 | + log.debug('save_meta data {bible}, {version}, {copyright}, {perms}'.format(bible=bible, |
1017 | + version=version, |
1018 | + cr=copyright, |
1019 | + perms=permissions)) |
1020 | self.db_cache[bible].save_meta('name', version) |
1021 | self.db_cache[bible].save_meta('copyright', copyright) |
1022 | self.db_cache[bible].save_meta('permissions', permissions) |
1023 | @@ -375,14 +381,14 @@ |
1024 | """ |
1025 | Returns the meta data for a given key. |
1026 | """ |
1027 | - log.debug('get_meta %s,%s', bible, key) |
1028 | + log.debug('get_meta {bible},{key}'.format(bible=bible, key=key)) |
1029 | return self.db_cache[bible].get_object(BibleMeta, key) |
1030 | |
1031 | def update_book(self, bible, book): |
1032 | """ |
1033 | Update a book of the bible. |
1034 | """ |
1035 | - log.debug('BibleManager.update_book("%s", "%s")', bible, book.name) |
1036 | + log.debug('BibleManager.update_book("{bible}", "{name}")'.format(bible=bible, name=book.name)) |
1037 | self.db_cache[bible].update_book(book) |
1038 | |
1039 | def exists(self, name): |
1040 | @@ -392,7 +398,7 @@ |
1041 | if not isinstance(name, str): |
1042 | name = str(name) |
1043 | for bible in list(self.db_cache.keys()): |
1044 | - log.debug('Bible from cache in is_new_bible %s', bible) |
1045 | + log.debug('Bible from cache in is_new_bible {bible}'.format(bible=bible)) |
1046 | if not isinstance(bible, str): |
1047 | bible = str(bible) |
1048 | if bible == name: |
1049 | |
1050 | === modified file 'openlp/plugins/bibles/lib/mediaitem.py' |
1051 | --- openlp/plugins/bibles/lib/mediaitem.py 2016-04-10 20:24:07 +0000 |
1052 | +++ openlp/plugins/bibles/lib/mediaitem.py 2016-05-21 08:42:57 +0000 |
1053 | @@ -280,7 +280,7 @@ |
1054 | def retranslateUi(self): |
1055 | log.debug('retranslateUi') |
1056 | self.quick_search_label.setText(translate('BiblesPlugin.MediaItem', 'Find:')) |
1057 | - self.quickVersionLabel.setText('%s:' % UiStrings().Version) |
1058 | + self.quickVersionLabel.setText('{version}:'.format(version=UiStrings().Version)) |
1059 | self.quickSecondLabel.setText(translate('BiblesPlugin.MediaItem', 'Second:')) |
1060 | self.quickStyleLabel.setText(UiStrings().LayoutStyle) |
1061 | self.quickStyleComboBox.setItemText(LayoutStyle.VersePerSlide, UiStrings().VersePerSlide) |
1062 | @@ -294,7 +294,7 @@ |
1063 | self.advanced_verse_label.setText(translate('BiblesPlugin.MediaItem', 'Verse:')) |
1064 | self.advanced_from_label.setText(translate('BiblesPlugin.MediaItem', 'From:')) |
1065 | self.advanced_to_label.setText(translate('BiblesPlugin.MediaItem', 'To:')) |
1066 | - self.advancedVersionLabel.setText('%s:' % UiStrings().Version) |
1067 | + self.advancedVersionLabel.setText('{version}:'.format(version=UiStrings().Version)) |
1068 | self.advancedSecondLabel.setText(translate('BiblesPlugin.MediaItem', 'Second:')) |
1069 | self.advancedStyleLabel.setText(UiStrings().LayoutStyle) |
1070 | self.advancedStyleComboBox.setItemText(LayoutStyle.VersePerSlide, UiStrings().VersePerSlide) |
1071 | @@ -316,7 +316,8 @@ |
1072 | translate('BiblesPlugin.MediaItem', 'Text Search'), |
1073 | translate('BiblesPlugin.MediaItem', 'Search Text...')) |
1074 | ]) |
1075 | - self.quick_search_edit.set_current_search_type(Settings().value('%s/last search type' % self.settings_section)) |
1076 | + text = self.settings_section |
1077 | + self.quick_search_edit.set_current_search_type(Settings().value('{text}/last search type'.format(text=text))) |
1078 | self.config_update() |
1079 | log.debug('bible manager initialise complete') |
1080 | |
1081 | @@ -364,7 +365,7 @@ |
1082 | :param bible: The bible to initialise (unicode). |
1083 | :param last_book_id: The "book reference id" of the book which is chosen at the moment. (int) |
1084 | """ |
1085 | - log.debug('initialise_advanced_bible %s, %s', bible, last_book_id) |
1086 | + log.debug('initialise_advanced_bible {bible}, {ref}'.format(bible=bible, ref=last_book_id)) |
1087 | book_data = self.plugin.manager.get_books(bible) |
1088 | second_bible = self.advancedSecondComboBox.currentText() |
1089 | if second_bible != '': |
1090 | @@ -406,7 +407,7 @@ |
1091 | self.initialise_chapter_verse(bible, first_book['name'], first_book['book_reference_id']) |
1092 | |
1093 | def initialise_chapter_verse(self, bible, book, book_ref_id): |
1094 | - log.debug('initialise_chapter_verse %s, %s, %s', bible, book, book_ref_id) |
1095 | + log.debug('initialise_chapter_verse {bible}, {book), {ref}'.format(bible=bible, book=book, ref=book_ref_id)) |
1096 | book = self.plugin.manager.get_book_by_id(bible, book_ref_id) |
1097 | self.chapter_count = self.plugin.manager.get_chapter_count(bible, book) |
1098 | verse_count = self.plugin.manager.get_verse_count_by_book_ref_id(bible, book_ref_id, 1) |
1099 | @@ -427,9 +428,11 @@ |
1100 | """ |
1101 | log.debug('update_auto_completer') |
1102 | # Save the current search type to the configuration. |
1103 | - Settings().setValue('%s/last search type' % self.settings_section, self.quick_search_edit.current_search_type()) |
1104 | + Settings().setValue('{section}/last search type'.format(section=self.settings_section), |
1105 | + self.quick_search_edit.current_search_type()) |
1106 | # Save the current bible to the configuration. |
1107 | - Settings().setValue(self.settings_section + '/quick bible', self.quickVersionComboBox.currentText()) |
1108 | + Settings().setValue('{section}/quick bible'.format(section=self.settings_section), |
1109 | + self.quickVersionComboBox.currentText()) |
1110 | books = [] |
1111 | # We have to do a 'Reference Search'. |
1112 | if self.quick_search_edit.current_search_type() == BibleSearch.Reference: |
1113 | @@ -502,9 +505,10 @@ |
1114 | if bible: |
1115 | if QtWidgets.QMessageBox.question( |
1116 | self, UiStrings().ConfirmDelete, |
1117 | - translate('BiblesPlugin.MediaItem', 'Are you sure you want to completely delete "%s" Bible from ' |
1118 | - 'OpenLP?\n\nYou will need to re-import this Bible to use it ' |
1119 | - 'again.') % bible, |
1120 | + translate('BiblesPlugin.MediaItem', |
1121 | + 'Are you sure you want to completely delete "{bible}" Bible ' |
1122 | + 'from OpenLP?\n\nYou will need to re-import this Bible to use it ' |
1123 | + 'again.').format(bible=bible), |
1124 | QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No), |
1125 | QtWidgets.QMessageBox.Yes) == QtWidgets.QMessageBox.No: |
1126 | return |
1127 | @@ -606,7 +610,7 @@ |
1128 | :param combo: The combo box itself (QComboBox). |
1129 | :param restore: If True, then the combo's currentText will be restored after adjusting (if possible). |
1130 | """ |
1131 | - log.debug('adjust_combo_box %s, %s, %s', combo, range_from, range_to) |
1132 | + log.debug('adjust_combo_box {box}, {start}, {end}'.format(box=combo, start=range_from, end=range_to)) |
1133 | if restore: |
1134 | old_text = combo.currentText() |
1135 | combo.clear() |
1136 | @@ -633,7 +637,7 @@ |
1137 | range_separator = get_reference_separator('sep_r_display') |
1138 | verse_range = chapter_from + verse_separator + verse_from + range_separator + chapter_to + \ |
1139 | verse_separator + verse_to |
1140 | - verse_text = '%s %s' % (book, verse_range) |
1141 | + verse_text = '{book} {verse}'.format(book=book, verse=verse_range) |
1142 | self.application.set_busy_cursor() |
1143 | self.search_results = self.plugin.manager.get_verses(bible, verse_text, book_ref_id) |
1144 | if second_bible: |
1145 | @@ -678,8 +682,8 @@ |
1146 | for verse in self.search_results: |
1147 | db_book = bibles[second_bible].get_book_by_book_ref_id(verse.book.book_reference_id) |
1148 | if not db_book: |
1149 | - log.debug('Passage "%s %d:%d" not found in Second Bible' % |
1150 | - (verse.book.name, verse.chapter, verse.verse)) |
1151 | + log.debug('Passage "{name} {chapter:d}:{verse:d}" not found in ' |
1152 | + 'Second Bible'.format(name=verse.book.name, chapter=verse.chapter, verse=verse.verse)) |
1153 | passage_not_found = True |
1154 | count += 1 |
1155 | continue |
1156 | @@ -688,9 +692,10 @@ |
1157 | if passage_not_found: |
1158 | QtWidgets.QMessageBox.information( |
1159 | self, translate('BiblesPlugin.MediaItem', 'Information'), |
1160 | - translate('BiblesPlugin.MediaItem', 'The second Bible does not contain all the verses ' |
1161 | - 'that are in the main Bible. Only verses found in both Bibles will be shown. %d ' |
1162 | - 'verses have not been included in the results.') % count, |
1163 | + translate('BiblesPlugin.MediaItem', |
1164 | + 'The second Bible does not contain all the verses that are in the main Bible. ' |
1165 | + 'Only verses found in both Bibles will be shown. {count:d} verses have not been ' |
1166 | + 'included in the results.').format(count=count), |
1167 | QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Ok)) |
1168 | self.search_results = new_search_results |
1169 | self.second_search_results = bibles[second_bible].get_verses(text) |
1170 | @@ -767,10 +772,19 @@ |
1171 | except TypeError: |
1172 | log.exception('The second_search_results does not have this book.') |
1173 | break |
1174 | - bible_text = '%s %d%s%d (%s, %s)' % (book, verse.chapter, verse_separator, verse.verse, version, |
1175 | - second_version) |
1176 | + bible_text = ('{book} {chapter:d}{sep}{verse:d} ' |
1177 | + '({version1}, {version2})').format(book=book, |
1178 | + chapter=verse.chapter, |
1179 | + sep=verse_separator, |
1180 | + verse=verse.verse, |
1181 | + version1=version, |
1182 | + version2=second_version) |
1183 | else: |
1184 | - bible_text = '%s %d%s%d (%s)' % (book, verse.chapter, verse_separator, verse.verse, version) |
1185 | + bible_text = '{book} {chapter:d}{sep}{verse:d} ({version})'.format(book=book, |
1186 | + chapter=verse.chapter, |
1187 | + sep=verse_separator, |
1188 | + verse=verse.verse, |
1189 | + version=version) |
1190 | bible_verse = QtWidgets.QListWidgetItem(bible_text) |
1191 | bible_verse.setData(QtCore.Qt.UserRole, data) |
1192 | items.append(bible_verse) |
1193 | @@ -817,20 +831,22 @@ |
1194 | verses.add(book, chapter, verse, version, copyright, permissions) |
1195 | verse_text = self.format_verse(old_chapter, chapter, verse) |
1196 | if second_bible: |
1197 | - bible_text = '%s%s\n\n%s %s' % (verse_text, text, verse_text, second_text) |
1198 | + bible_text = '{verse}{text1}\n\n{verse} {text2}'.format(verse=verse_text, |
1199 | + text1=text, |
1200 | + text2=second_text) |
1201 | raw_slides.append(bible_text.rstrip()) |
1202 | bible_text = '' |
1203 | # If we are 'Verse Per Slide' then create a new slide. |
1204 | elif self.settings.layout_style == LayoutStyle.VersePerSlide: |
1205 | - bible_text = '%s%s' % (verse_text, text) |
1206 | + bible_text = '{verse}{text}'.format(verse=verse_text, text=text) |
1207 | raw_slides.append(bible_text.rstrip()) |
1208 | bible_text = '' |
1209 | # If we are 'Verse Per Line' then force a new line. |
1210 | elif self.settings.layout_style == LayoutStyle.VersePerLine: |
1211 | - bible_text = '%s%s%s\n' % (bible_text, verse_text, text) |
1212 | + bible_text = '{bible}{verse}{text}\n'.format(bible=bible_text, verse=verse_text, text=text) |
1213 | # We have to be 'Continuous'. |
1214 | else: |
1215 | - bible_text = '%s %s%s\n' % (bible_text, verse_text, text) |
1216 | + bible_text = '{bible} {verse}{text}\n'.format(bible=bible_text, verse=verse_text, text=text) |
1217 | bible_text = bible_text.strip(' ') |
1218 | if not old_item: |
1219 | start_item = bitem |
1220 | @@ -857,7 +873,7 @@ |
1221 | service_item.add_capability(ItemCapabilities.CanWordSplit) |
1222 | service_item.add_capability(ItemCapabilities.CanEditTitle) |
1223 | # Service Item: Title |
1224 | - service_item.title = '%s %s' % (verses.format_verses(), verses.format_versions()) |
1225 | + service_item.title = '{verse} {version}'.format(verse=verses.format_verses(), version=verses.format_versions()) |
1226 | # Service Item: Theme |
1227 | if not self.settings.bible_theme: |
1228 | service_item.theme = None |
1229 | @@ -885,7 +901,7 @@ |
1230 | start_bible = self._decode_qt_object(start_bitem, 'bible') |
1231 | start_second_bible = self._decode_qt_object(start_bitem, 'second_bible') |
1232 | if start_second_bible: |
1233 | - bibles = '%s, %s' % (start_bible, start_second_bible) |
1234 | + bibles = '{bible1}, {bible2}'.format(bible1=start_bible, bible2=start_second_bible) |
1235 | else: |
1236 | bibles = start_bible |
1237 | if start_chapter == old_chapter: |
1238 | @@ -896,7 +912,7 @@ |
1239 | else: |
1240 | verse_range = start_chapter + verse_separator + start_verse + \ |
1241 | range_separator + old_chapter + verse_separator + old_verse |
1242 | - return '%s %s (%s)' % (start_book, verse_range, bibles) |
1243 | + return '{book} {verse} ({bible})'.format(book=start_book, verse=verse_range, bible=bibles) |
1244 | |
1245 | def check_title(self, bitem, old_bitem): |
1246 | """ |
1247 | @@ -949,12 +965,12 @@ |
1248 | else: |
1249 | verse_text = str(verse) |
1250 | if self.settings.display_style == DisplayStyle.Round: |
1251 | - return '{su}(%s){/su} ' % verse_text |
1252 | + return '{{su}}({verse}){{/su}} '.format(verse=verse_text) |
1253 | if self.settings.display_style == DisplayStyle.Curly: |
1254 | - return '{su}{%s}{/su} ' % verse_text |
1255 | + return '{{su}}{{{verse}}}{{/su}} '.format(verse=verse_text) |
1256 | if self.settings.display_style == DisplayStyle.Square: |
1257 | - return '{su}[%s]{/su} ' % verse_text |
1258 | - return '{su}%s{/su} ' % verse_text |
1259 | + return '{{su}}[{verse}]{{/su}} '.format(verse=verse_text) |
1260 | + return '{{su}}{verse}{{/su}} '.format(verse=verse_text) |
1261 | |
1262 | def search(self, string, showError): |
1263 | """ |
1264 | |
1265 | === modified file 'openlp/plugins/bibles/lib/opensong.py' |
1266 | --- openlp/plugins/bibles/lib/opensong.py 2015-12-31 22:46:06 +0000 |
1267 | +++ openlp/plugins/bibles/lib/opensong.py 2016-05-21 08:42:57 +0000 |
1268 | @@ -63,7 +63,7 @@ |
1269 | """ |
1270 | Loads a Bible from file. |
1271 | """ |
1272 | - log.debug('Starting OpenSong import from "%s"' % self.filename) |
1273 | + log.debug('Starting OpenSong import from "{name}"'.format(name=self.filename)) |
1274 | if not isinstance(self.filename, str): |
1275 | self.filename = str(self.filename, 'utf8') |
1276 | import_file = None |
1277 | @@ -84,14 +84,14 @@ |
1278 | # No language info in the opensong format, so ask the user |
1279 | language_id = self.get_language(bible_name) |
1280 | if not language_id: |
1281 | - log.error('Importing books from "%s" failed' % self.filename) |
1282 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
1283 | return False |
1284 | for book in bible.b: |
1285 | if self.stop_import_flag: |
1286 | break |
1287 | book_ref_id = self.get_book_ref_id_by_name(str(book.attrib['n']), len(bible.b), language_id) |
1288 | if not book_ref_id: |
1289 | - log.error('Importing books from "%s" failed' % self.filename) |
1290 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
1291 | return False |
1292 | book_details = BiblesResourcesDB.get_book_by_id(book_ref_id) |
1293 | db_book = self.create_book(book.attrib['n'], book_ref_id, book_details['testament_id']) |
1294 | @@ -117,14 +117,14 @@ |
1295 | if len(verse_parts) > 1: |
1296 | number = int(verse_parts[0]) |
1297 | except TypeError: |
1298 | - log.warning('Illegal verse number: %s', str(verse.attrib['n'])) |
1299 | + log.warning('Illegal verse number: {verse:d}'.format(verse.attrib['n'])) |
1300 | verse_number = number |
1301 | else: |
1302 | verse_number += 1 |
1303 | self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse)) |
1304 | - self.wizard.increment_progress_bar( |
1305 | - translate('BiblesPlugin.Opensong', 'Importing %(bookname)s %(chapter)s...') % |
1306 | - {'bookname': db_book.name, 'chapter': chapter_number}) |
1307 | + self.wizard.increment_progress_bar(translate('BiblesPlugin.Opensong', |
1308 | + 'Importing {name} {chapter}...' |
1309 | + ).format(name=db_book.name, chapter=chapter_number)) |
1310 | self.session.commit() |
1311 | self.application.process_events() |
1312 | except etree.XMLSyntaxError as inst: |
1313 | |
1314 | === modified file 'openlp/plugins/bibles/lib/osis.py' |
1315 | --- openlp/plugins/bibles/lib/osis.py 2015-12-31 22:46:06 +0000 |
1316 | +++ openlp/plugins/bibles/lib/osis.py 2016-05-21 08:42:57 +0000 |
1317 | @@ -49,7 +49,7 @@ |
1318 | """ |
1319 | Loads a Bible from file. |
1320 | """ |
1321 | - log.debug('Starting OSIS import from "%s"' % self.filename) |
1322 | + log.debug('Starting OSIS import from "{name}"'.format(name=self.filename)) |
1323 | if not isinstance(self.filename, str): |
1324 | self.filename = str(self.filename, 'utf8') |
1325 | import_file = None |
1326 | @@ -69,7 +69,7 @@ |
1327 | if not language_id: |
1328 | language_id = self.get_language(bible_name) |
1329 | if not language_id: |
1330 | - log.error('Importing books from "%s" failed' % self.filename) |
1331 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
1332 | return False |
1333 | self.save_meta('language_id', language_id) |
1334 | num_books = int(osis_bible_tree.xpath("count(//ns:div[@type='book'])", namespaces=namespace)) |
1335 | @@ -129,7 +129,7 @@ |
1336 | if not book_ref_id: |
1337 | book_ref_id = self.get_book_ref_id_by_localised_name(book.get('osisID')) |
1338 | if not book_ref_id: |
1339 | - log.error('Importing books from "%s" failed' % self.filename) |
1340 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
1341 | return False |
1342 | book_details = BiblesResourcesDB.get_book_by_id(book_ref_id) |
1343 | db_book = self.create_book(book_details['name'], book_ref_id, book_details['testament_id']) |
1344 | @@ -187,7 +187,8 @@ |
1345 | trace_error_handler(log) |
1346 | success = False |
1347 | critical_error_message_box(message=translate('BiblesPlugin.OsisImport', |
1348 | - 'The file is not a valid OSIS-XML file: \n%s' % e.msg)) |
1349 | + 'The file is not a valid OSIS-XML file:' |
1350 | + '\n{text}').format(text=e.msg)) |
1351 | finally: |
1352 | if import_file: |
1353 | import_file.close() |
1354 | |
1355 | === modified file 'openlp/plugins/bibles/lib/sword.py' |
1356 | --- openlp/plugins/bibles/lib/sword.py 2016-04-23 18:33:53 +0000 |
1357 | +++ openlp/plugins/bibles/lib/sword.py 2016-05-21 08:42:57 +0000 |
1358 | @@ -51,7 +51,7 @@ |
1359 | """ |
1360 | Loads a Bible from SWORD module. |
1361 | """ |
1362 | - log.debug('Starting SWORD import from "%s"' % self.sword_key) |
1363 | + log.debug('Starting SWORD import from "{key}"'.format(key=self.sword_key)) |
1364 | success = True |
1365 | try: |
1366 | pysword_modules = modules.SwordModules(self.sword_path) |
1367 | @@ -84,14 +84,14 @@ |
1368 | verse_number += 1 |
1369 | self.create_verse(db_book.id, chapter_number, verse_number, verse) |
1370 | self.wizard.increment_progress_bar( |
1371 | - translate('BiblesPlugin.Sword', 'Importing %s...') % db_book.name) |
1372 | + translate('BiblesPlugin.Sword', 'Importing {name}...').format(name=db_book.name)) |
1373 | self.session.commit() |
1374 | self.application.process_events() |
1375 | except Exception as e: |
1376 | critical_error_message_box( |
1377 | message=translate('BiblesPlugin.SwordImport', 'An unexpected error happened while importing the SWORD ' |
1378 | 'bible, please report this to the OpenLP developers.\n' |
1379 | - '%s' % e)) |
1380 | + '{error}').format(error=e)) |
1381 | log.exception(str(e)) |
1382 | success = False |
1383 | if self.stop_import_flag: |
1384 | |
1385 | === modified file 'openlp/plugins/bibles/lib/upgrade.py' |
1386 | --- openlp/plugins/bibles/lib/upgrade.py 2015-12-31 22:46:06 +0000 |
1387 | +++ openlp/plugins/bibles/lib/upgrade.py 2016-05-21 08:42:57 +0000 |
1388 | @@ -101,7 +101,7 @@ |
1389 | metadata_table.c.key == 'download source' |
1390 | ) |
1391 | ).scalar() |
1392 | - log.debug('download source: %s', value_count) |
1393 | + log.debug('download source: {count}'.format(count=value_count)) |
1394 | if value_count > 0: |
1395 | session.execute(insert(metadata_table).values( |
1396 | key='download_source', |
1397 | @@ -121,7 +121,7 @@ |
1398 | metadata_table.c.key == 'download name' |
1399 | ) |
1400 | ).scalar() |
1401 | - log.debug('download name: %s', value_count) |
1402 | + log.debug('download name: {count}'.format(count=value_count)) |
1403 | if value_count > 0: |
1404 | session.execute(insert(metadata_table).values( |
1405 | key='download_name', |
1406 | @@ -141,7 +141,7 @@ |
1407 | metadata_table.c.key == 'proxy server' |
1408 | ) |
1409 | ).scalar() |
1410 | - log.debug('proxy server: %s', value_count) |
1411 | + log.debug('proxy server: {count}'.format(count=value_count)) |
1412 | if value_count > 0: |
1413 | session.execute(insert(metadata_table).values( |
1414 | key='proxy_server', |
1415 | @@ -161,7 +161,7 @@ |
1416 | metadata_table.c.key == 'proxy username' |
1417 | ) |
1418 | ).scalar() |
1419 | - log.debug('proxy username: %s', value_count) |
1420 | + log.debug('proxy username: {count}'.format(count=value_count)) |
1421 | if value_count > 0: |
1422 | session.execute(insert(metadata_table).values( |
1423 | key='proxy_username', |
1424 | @@ -181,7 +181,7 @@ |
1425 | metadata_table.c.key == 'proxy password' |
1426 | ) |
1427 | ).scalar() |
1428 | - log.debug('proxy password: %s', value_count) |
1429 | + log.debug('proxy password: {count}'.format(count=value_count)) |
1430 | if value_count > 0: |
1431 | session.execute(insert(metadata_table).values( |
1432 | key='proxy_password', |
1433 | |
1434 | === modified file 'openlp/plugins/bibles/lib/versereferencelist.py' |
1435 | --- openlp/plugins/bibles/lib/versereferencelist.py 2015-12-31 22:46:06 +0000 |
1436 | +++ openlp/plugins/bibles/lib/versereferencelist.py 2016-05-21 08:42:57 +0000 |
1437 | @@ -61,23 +61,29 @@ |
1438 | result = '' |
1439 | for index, verse in enumerate(self.verse_list): |
1440 | if index == 0: |
1441 | - result = '%s %s%s%s' % (verse['book'], verse['chapter'], verse_sep, verse['start']) |
1442 | + result = '{book} {chapter}{sep}{verse}'.format(book=verse['book'], |
1443 | + chapter=verse['chapter'], |
1444 | + sep=verse_sep, |
1445 | + verse=verse['start']) |
1446 | if verse['start'] != verse['end']: |
1447 | - result = '%s%s%s' % (result, range_sep, verse['end']) |
1448 | + result = '{result}{sep}{end}'.format(result=result, sep=range_sep, end=verse['end']) |
1449 | continue |
1450 | prev = index - 1 |
1451 | if self.verse_list[prev]['version'] != verse['version']: |
1452 | - result = '%s (%s)' % (result, self.verse_list[prev]['version']) |
1453 | - result += '%s ' % list_sep |
1454 | + result = '{result} ({version})'.format(result=result, version=self.verse_list[prev]['version']) |
1455 | + result += '{sep} '.format(sep=list_sep) |
1456 | if self.verse_list[prev]['book'] != verse['book']: |
1457 | - result = '%s%s %s%s' % (result, verse['book'], verse['chapter'], verse_sep) |
1458 | + result = '{result}{book} {chapter}{sep}'.format(result=result, |
1459 | + book=verse['book'], |
1460 | + chapter=verse['chapter'], |
1461 | + sep=verse_sep) |
1462 | elif self.verse_list[prev]['chapter'] != verse['chapter']: |
1463 | - result = '%s%s%s' % (result, verse['chapter'], verse_sep) |
1464 | + result = '{result}{chapter}{sep}'.format(result=result, chapter=verse['chapter'], sep=verse_sep) |
1465 | result += str(verse['start']) |
1466 | if verse['start'] != verse['end']: |
1467 | - result = '%s%s%s' % (result, range_sep, verse['end']) |
1468 | + result = '{result}{sep}{end}'.format(result=result, sep=range_sep, end=verse['end']) |
1469 | if len(self.version_list) > 1: |
1470 | - result = '%s (%s)' % (result, verse['version']) |
1471 | + result = '{result} ({version})'.format(result=result, version=verse['version']) |
1472 | return result |
1473 | |
1474 | def format_versions(self, copyright=True, permission=True): |
1475 | |
1476 | === modified file 'openlp/plugins/bibles/lib/zefania.py' |
1477 | --- openlp/plugins/bibles/lib/zefania.py 2016-03-25 19:33:26 +0000 |
1478 | +++ openlp/plugins/bibles/lib/zefania.py 2016-05-21 08:42:57 +0000 |
1479 | @@ -48,7 +48,7 @@ |
1480 | """ |
1481 | Loads a Bible from file. |
1482 | """ |
1483 | - log.debug('Starting Zefania import from "%s"' % self.filename) |
1484 | + log.debug('Starting Zefania import from "{name}"'.format(name=self.filename)) |
1485 | if not isinstance(self.filename, str): |
1486 | self.filename = str(self.filename, 'utf8') |
1487 | import_file = None |
1488 | @@ -67,7 +67,7 @@ |
1489 | if not language_id: |
1490 | language_id = self.get_language(bible_name) |
1491 | if not language_id: |
1492 | - log.error('Importing books from "%s" failed' % self.filename) |
1493 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
1494 | return False |
1495 | self.save_meta('language_id', language_id) |
1496 | num_books = int(zefania_bible_tree.xpath('count(//BIBLEBOOK)')) |
1497 | @@ -92,7 +92,7 @@ |
1498 | log.debug('Could not find a name, will use number, basically a guess.') |
1499 | book_ref_id = int(bnumber) |
1500 | if not book_ref_id: |
1501 | - log.error('Importing books from "%s" failed' % self.filename) |
1502 | + log.error('Importing books from "{name}" failed'.format(name=self.filename)) |
1503 | return False |
1504 | book_details = BiblesResourcesDB.get_book_by_id(book_ref_id) |
1505 | db_book = self.create_book(book_details['name'], book_ref_id, book_details['testament_id']) |
1506 | @@ -104,8 +104,9 @@ |
1507 | verse_number = VERS.get("vnumber") |
1508 | self.create_verse(db_book.id, chapter_number, verse_number, VERS.text.replace('<BR/>', '\n')) |
1509 | self.wizard.increment_progress_bar( |
1510 | - translate('BiblesPlugin.Zefnia', 'Importing %(bookname)s %(chapter)s...') % |
1511 | - {'bookname': db_book.name, 'chapter': chapter_number}) |
1512 | + translate('BiblesPlugin.Zefnia', |
1513 | + 'Importing {book} {chapter}...').format(book=db_book.name, |
1514 | + chapter=chapter_number)) |
1515 | self.session.commit() |
1516 | self.application.process_events() |
1517 | except Exception as e: |
1518 | |
1519 | === modified file 'tests/functional/openlp_core_lib/test_projectordb.py' |
1520 | --- tests/functional/openlp_core_lib/test_projectordb.py 2016-05-20 16:22:06 +0000 |
1521 | +++ tests/functional/openlp_core_lib/test_projectordb.py 2016-05-21 08:42:57 +0000 |
1522 | @@ -29,6 +29,7 @@ |
1523 | from unittest import TestCase |
1524 | |
1525 | from openlp.core.lib.projector.db import Manufacturer, Model, Projector, ProjectorDB, ProjectorSource, Source |
1526 | +from openlp.core.lib.projector.constants import PJLINK_PORT |
1527 | |
1528 | from tests.functional import MagicMock, patch |
1529 | from tests.resources.projector.data import TEST_DB, TEST1_DATA, TEST2_DATA, TEST3_DATA |
1530 | @@ -195,7 +196,7 @@ |
1531 | |
1532 | def manufacturer_repr_test(self): |
1533 | """ |
1534 | - Test manufacturer class __repr__ text |
1535 | + Test Manufacturer.__repr__ text |
1536 | """ |
1537 | # GIVEN: Test object |
1538 | manufacturer = Manufacturer() |
1539 | @@ -209,7 +210,7 @@ |
1540 | |
1541 | def model_repr_test(self): |
1542 | """ |
1543 | - Test model class __repr__ text |
1544 | + Test Model.__repr__ text |
1545 | """ |
1546 | # GIVEN: Test object |
1547 | model = Model() |
1548 | @@ -223,7 +224,7 @@ |
1549 | |
1550 | def source_repr_test(self): |
1551 | """ |
1552 | - Test source.__repr__ text |
1553 | + Test Source.__repr__ text |
1554 | """ |
1555 | # GIVEN: Test object |
1556 | source = Source() |
1557 | @@ -236,3 +237,31 @@ |
1558 | # THEN: __repr__ should return a proper string |
1559 | self.assertEqual(str(source), '<Source(pjlink_name="Test object", pjlink_code="11", text="Input text")>', |
1560 | 'Source.__repr__() should have returned a proper representation string') |
1561 | + |
1562 | + def projector_repr_test(self): |
1563 | + """ |
1564 | + Test Projector.__repr__() text |
1565 | + """ |
1566 | + # GIVEN: Test object |
1567 | + projector = Projector() |
1568 | + |
1569 | + # WHEN: projector() is populated |
1570 | + # NOTE: projector.pin, projector.other, projector.sources should all return None |
1571 | + # projector.source_list should return an empty list |
1572 | + projector.id = 0 |
1573 | + projector.ip = '127.0.0.1' |
1574 | + projector.port = PJLINK_PORT |
1575 | + projector.name = 'Test One' |
1576 | + projector.location = 'Somewhere over the rainbow' |
1577 | + projector.notes = 'Not again' |
1578 | + projector.pjlink_name = 'TEST' |
1579 | + projector.manufacturer = 'IN YOUR DREAMS' |
1580 | + projector.model = 'OpenLP' |
1581 | + |
1582 | + # THEN: __repr__ should return a proper string |
1583 | + self.assertEqual(str(projector), |
1584 | + '< Projector(id="0", ip="127.0.0.1", port="4352", pin="None", name="Test One", ' |
1585 | + 'location="Somewhere over the rainbow", notes="Not again", pjlink_name="TEST", ' |
1586 | + 'manufacturer="IN YOUR DREAMS", model="OpenLP", other="None", sources="None", ' |
1587 | + 'source_list="[]") >', |
1588 | + 'Projector.__repr__() should have returned a proper representation string') |
1589 | |
1590 | === modified file 'tests/functional/openlp_plugins/bibles/test_http.py' |
1591 | --- tests/functional/openlp_plugins/bibles/test_http.py 2016-02-04 20:17:40 +0000 |
1592 | +++ tests/functional/openlp_plugins/bibles/test_http.py 2016-05-21 08:42:57 +0000 |
1593 | @@ -104,7 +104,7 @@ |
1594 | result = instance.get_books_from_http('NIV') |
1595 | |
1596 | # THEN: The rest mocks should be called with known values and get_books_from_http should return None |
1597 | - self.mock_log.debug.assert_called_once_with('BSExtract.get_books_from_http("%s")', 'NIV') |
1598 | + self.mock_log.debug.assert_called_once_with('BSExtract.get_books_from_http("{book}")'.format(book='NIV')) |
1599 | self.mock_urllib.parse.quote.assert_called_once_with(b'NIV') |
1600 | self.mock_get_soup_for_bible_ref.assert_called_once_with( |
1601 | 'http://m.bibleserver.com/overlay/selectBook?translation=NIV') |
1602 | @@ -132,7 +132,7 @@ |
1603 | result = instance.get_books_from_http('NIV') |
1604 | |
1605 | # THEN: The rest mocks should be called with known values and get_books_from_http should return None |
1606 | - self.mock_log.debug.assert_called_once_with('BSExtract.get_books_from_http("%s")', 'NIV') |
1607 | + self.mock_log.debug.assert_called_once_with('BSExtract.get_books_from_http("{book}")'.format(book='NIV')) |
1608 | self.mock_urllib.parse.quote.assert_called_once_with(b'NIV') |
1609 | self.mock_get_soup_for_bible_ref.assert_called_once_with( |
1610 | 'http://m.bibleserver.com/overlay/selectBook?translation=NIV') |
1611 | @@ -167,7 +167,7 @@ |
1612 | |
1613 | # THEN: The rest mocks should be called with known values and get_books_from_http should return the two books |
1614 | # in the test data |
1615 | - self.mock_log.debug.assert_called_once_with('BSExtract.get_books_from_http("%s")', 'NIV') |
1616 | + self.mock_log.debug.assert_called_once_with('BSExtract.get_books_from_http("{book}")'.format(book='NIV')) |
1617 | self.mock_urllib.parse.quote.assert_called_once_with(b'NIV') |
1618 | self.mock_get_soup_for_bible_ref.assert_called_once_with( |
1619 | 'http://m.bibleserver.com/overlay/selectBook?translation=NIV') |
looks Ok