GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-23 08:22:24 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of github.com:dae/anki

Browse source
This commit is contained in:
Damien Elmes 2016-11-29 11:09:17 +10:00
commit e7c3859303
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aqt/editor.py
View file

@ -6,6 +6,7 @@ import os
import urllib.request, urllib.error, urllib.parse import urllib.request, urllib.error, urllib.parse
import ctypes import ctypes
import urllib.request, urllib.parse, urllib.error import urllib.request, urllib.parse, urllib.error
import warnings
from anki.lang import _ from anki.lang import _
from aqt.qt import * from aqt.qt import *
@ -641,7 +642,9 @@ class Editor(object):
html = form.textEdit.toPlainText() html = form.textEdit.toPlainText()
# filter html through beautifulsoup so we can strip out things like a # filter html through beautifulsoup so we can strip out things like a
# leading </div> # leading </div>
html = str(BeautifulSoup(html, "html.parser")) with warnings.catch_warnings() as w:
warnings.simplefilter('ignore', UserWarning)
html = str(BeautifulSoup(html, "html.parser"))
self.note.fields[self.currentField] = html self.note.fields[self.currentField] = html
self.loadNote() self.loadNote()
# focus field so it's saved # focus field so it's saved
@ -871,7 +874,9 @@ to a cloze type first, via Edit>Change Note Type."""))
###################################################################### ######################################################################
def _filterHTML(self, html, localize=False): def _filterHTML(self, html, localize=False):
doc = BeautifulSoup(html, "html.parser") with warnings.catch_warnings() as w:
warnings.simplefilter('ignore', UserWarning)
doc = BeautifulSoup(html, "html.parser")
# remove implicit regular font style from outermost element # remove implicit regular font style from outermost element
if doc.span: if doc.span:
try: try:

2
aqt/importing.py
View file

@ -225,7 +225,7 @@ you can enter it here. Use \\t to represent tab."""),
self.grid.addWidget(QLabel(text), num, 1) self.grid.addWidget(QLabel(text), num, 1)
button = QPushButton(_("Change")) button = QPushButton(_("Change"))
self.grid.addWidget(button, num, 2) self.grid.addWidget(button, num, 2)
button.clicked.connect(lambda s=self,n=num: s.changeMappingNum(n)) button.clicked.connect(lambda _, s=self,n=num: s.changeMappingNum(n))
def changeMappingNum(self, n): def changeMappingNum(self, n):
f = ChangeMap(self.mw, self.importer.model, self.mapping[n]).getField() f = ChangeMap(self.mw, self.importer.model, self.mapping[n]).getField()