Compare commits
2 Commits
917aa0fbc5
...
f83a4b1430
Author | SHA1 | Date |
---|---|---|
pictuga | f83a4b1430 | |
pictuga | 87d2fe772d |
|
@ -19,19 +19,13 @@ import re
|
||||||
|
|
||||||
import lxml.etree
|
import lxml.etree
|
||||||
import lxml.html
|
import lxml.html
|
||||||
|
import lxml.html.soupparser
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
|
|
||||||
def parse(data, encoding=None):
|
def parse(data, encoding=None):
|
||||||
if encoding:
|
kwargs = {'from_encoding': encoding} if encoding else {}
|
||||||
data = BeautifulSoup(data, 'lxml', from_encoding=encoding).prettify('utf-8')
|
return lxml.html.soupparser.fromstring(data, **kwargs)
|
||||||
|
|
||||||
else:
|
|
||||||
data = BeautifulSoup(data, 'lxml').prettify('utf-8')
|
|
||||||
|
|
||||||
parser = lxml.html.HTMLParser(remove_comments=True, encoding='utf-8')
|
|
||||||
|
|
||||||
return lxml.html.fromstring(data, parser=parser)
|
|
||||||
|
|
||||||
|
|
||||||
def count_words(string):
|
def count_words(string):
|
||||||
|
|
|
@ -277,7 +277,7 @@ def cgi_handle_request():
|
||||||
|
|
||||||
class WSGIRequestHandlerRequestUri(wsgiref.simple_server.WSGIRequestHandler):
|
class WSGIRequestHandlerRequestUri(wsgiref.simple_server.WSGIRequestHandler):
|
||||||
def get_environ(self):
|
def get_environ(self):
|
||||||
env = super().get_environ()
|
env = wsgiref.simple_server.WSGIRequestHandler.get_environ(self)
|
||||||
env['REQUEST_URI'] = self.path
|
env['REQUEST_URI'] = self.path
|
||||||
return env
|
return env
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue