Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e14175

Browse files
committed
ruff: pyupgrade to 3.8
ruff check --target-version py38 --select UP --fix .
1 parentfd4f032 commit1e14175

File tree

56 files changed

+39
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+39
-97
lines changed

‎debug-info.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importprint_function,unicode_literals
21

32
importplatform
43
importsys

‎doc/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
# -*- coding: utf-8 -*-
32
#
43
# html5lib documentation build configuration file, created by
54
# sphinx-quickstart on Wed May 8 00:04:49 2013.
@@ -100,7 +99,7 @@
10099
}
101100

102101

103-
classCExtMock(object):
102+
classCExtMock:
104103
"""Required for autodoc on readthedocs.org where you cannot build C extensions."""
105104
def__init__(self,*args,**kwargs):
106105
pass

‎html5lib/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* :func:`~.serializer.serialize`
2121
"""
2222

23-
from __future__importabsolute_import,division,unicode_literals
2423

2524
from .html5parserimportHTMLParser,parse,parseFragment
2625
from .treebuildersimportgetTreeBuilder

‎html5lib/_ihatexml.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importre
43
importwarnings
@@ -181,7 +180,7 @@ def escapeRegexp(string):
181180
nonPubidCharRegexp=re.compile("[^\x20\x0D\x0Aa-zA-Z0-9\\-'()+,./:=?;!*#@$_%]")
182181

183182

184-
classInfosetFilter(object):
183+
classInfosetFilter:
185184
replacementRegexp=re.compile(r"U[\dA-F]{5,5}")
186185

187186
def__init__(self,

‎html5lib/_inputstream.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromsiximporttext_type
43
fromsix.movesimporthttp_client,urllib
@@ -48,7 +47,7 @@
4847
charsUntilRegEx= {}
4948

5049

51-
classBufferedStream(object):
50+
classBufferedStream:
5251
"""Buffering for streams that do not have buffering of their own
5352
5453
The buffer is implemented as a list of chunks on the assumption that
@@ -145,7 +144,7 @@ def HTMLInputStream(source, **kwargs):
145144
returnHTMLBinaryInputStream(source,**kwargs)
146145

147146

148-
classHTMLUnicodeInputStream(object):
147+
classHTMLUnicodeInputStream:
149148
"""Provides a unicode stream of characters to the HTMLTokenizer.
150149
151150
This class takes care of character encoding and removing or replacing
@@ -673,7 +672,7 @@ def jumpTo(self, bytes):
673672
returnTrue
674673

675674

676-
classEncodingParser(object):
675+
classEncodingParser:
677676
"""Mini parser for detecting character encoding from meta elements"""
678677

679678
def__init__(self,data):
@@ -861,7 +860,7 @@ def getAttribute(self):
861860
attrValue.append(c)
862861

863862

864-
classContentAttrParser(object):
863+
classContentAttrParser:
865864
def__init__(self,data):
866865
assertisinstance(data,bytes)
867866
self.data=data

‎html5lib/_tokenizer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromsiximportunichraschr
43

@@ -24,7 +23,7 @@
2423
attributeMap=OrderedDict
2524

2625

27-
classHTMLTokenizer(object):
26+
classHTMLTokenizer:
2827
""" This class takes care of tokenizing HTML.
2928
3029
* self.currentToken

‎html5lib/_trie/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
from .pyimportTrie
43

‎html5lib/_trie/_base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
try:
43
fromcollections.abcimportMapping
54
exceptImportError:# Python 2.7
6-
fromcollectionsimportMapping
5+
fromcollections.abcimportMapping
76

87

98
classTrie(Mapping):

‎html5lib/_trie/py.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21
fromsiximporttext_type
32

43
frombisectimportbisect_left

‎html5lib/_utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromtypesimportModuleType
43

54
try:
65
fromcollections.abcimportMapping
76
exceptImportError:
8-
fromcollectionsimportMapping
7+
fromcollections.abcimportMapping
98

109
fromsiximporttext_type,PY3
1110

1211
ifPY3:
1312
importxml.etree.ElementTreeasdefault_etree
1413
else:
1514
try:
16-
importxml.etree.cElementTreeasdefault_etree
15+
importxml.etree.ElementTreeasdefault_etree
1716
exceptImportError:
1817
importxml.etree.ElementTreeasdefault_etree
1918

@@ -122,7 +121,7 @@ def moduleFactoryFactory(factory):
122121
moduleCache= {}
123122

124123
defmoduleFactory(baseModule,*args,**kwargs):
125-
ifisinstance(ModuleType.__name__,type("")):
124+
ifisinstance(ModuleType.__name__,str):
126125
name="_%s_factory"%baseModule.__name__
127126
else:
128127
name=b"_%s_factory"%baseModule.__name__

‎html5lib/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importstring
43

‎html5lib/filters/alphabeticalattributes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
from .importbase
43

‎html5lib/filters/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32

4-
classFilter(object):
3+
classFilter:
54
def__init__(self,source):
65
self.source=source
76

‎html5lib/filters/inject_meta_charset.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
from .importbase
43

‎html5lib/filters/lint.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromsiximporttext_type
43

‎html5lib/filters/optionaltags.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
from .importbase
43

‎html5lib/filters/sanitizer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
if Bleach is unsuitable for your needs.
77
88
"""
9-
from __future__importabsolute_import,division,unicode_literals
109

1110
importre
1211
importwarnings

‎html5lib/filters/whitespace.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importre
43

‎html5lib/html5parser.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21
fromsiximportviewkeys
32

43
from .import_inputstream
@@ -69,7 +68,7 @@ def parseFragment(doc, container="div", treebuilder="etree", namespaceHTMLElemen
6968
returnp.parseFragment(doc,container=container,**kwargs)
7069

7170

72-
classHTMLParser(object):
71+
classHTMLParser:
7372
"""HTML parser
7473
7574
Generates a tree structure from a stream of (possibly malformed) HTML.
@@ -397,7 +396,7 @@ def parseRCDataRawtext(self, token, contentType):
397396
self.phase=self.phases["text"]
398397

399398

400-
classPhase(object):
399+
classPhase:
401400
"""Base class for helper object that implements each phase of processing
402401
"""
403402
__slots__= ("parser","tree","__startTagCache","__endTagCache")

‎html5lib/serializer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21
fromsiximporttext_type
32

43
importre
@@ -101,7 +100,7 @@ def serialize(input, tree="etree", encoding=None, **serializer_opts):
101100
returns.render(walker(input),encoding)
102101

103102

104-
classHTMLSerializer(object):
103+
classHTMLSerializer:
105104

106105
# attribute quoting options
107106
quote_attr_values="legacy"# be secure by default

‎html5lib/tests/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
from __future__importabsolute_import,division,unicode_literals

‎html5lib/tests/conftest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importprint_function
21
importos.path
32
importsys
43

@@ -54,7 +53,7 @@ def pytest_configure(config):
5453
# Check for optional requirements
5554
req_file=os.path.join(_root,"requirements-optional.txt")
5655
ifos.path.exists(req_file):
57-
withopen(req_file,"r")asfp:
56+
withopen(req_file)asfp:
5857
forlineinfp:
5958
if (line.strip()and
6059
not (line.startswith("-r")or
@@ -79,7 +78,7 @@ def pytest_configure(config):
7978
importxml.etree.ElementTreeasElementTree
8079

8180
try:
82-
importxml.etree.cElementTreeascElementTree
81+
importxml.etree.ElementTreeascElementTree
8382
exceptImportError:
8483
msgs.append("cElementTree unable to be imported")
8584
else:

‎html5lib/tests/sanitizer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importcodecs
43
importjson

‎html5lib/tests/support.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
# pylint:disable=wrong-import-position
43

@@ -86,7 +85,7 @@ def __getitem__(self, key):
8685
returndict.get(self,key,self.default)
8786

8887

89-
classTestData(object):
88+
classTestData:
9089
def__init__(self,filename,newTestHeading="data",encoding="utf8"):
9190
ifencodingisNone:
9291
self.f=open(filename,mode="rb")

‎html5lib/tests/test_alphabeticalattributes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromcollectionsimportOrderedDict
43

‎html5lib/tests/test_encoding.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importos
43

@@ -9,7 +8,7 @@
98

109

1110
deftest_basic_prescan_length():
12-
data="<title>Caf\u00E9</title><!--a--><meta charset='utf-8'>".encode('utf-8')
11+
data="<title>Caf\u00E9</title><!--a--><meta charset='utf-8'>".encode()
1312
pad=1024-len(data)+1
1413
data=data.replace(b"-a-",b"-"+ (b"a"*pad)+b"-")
1514
assertlen(data)==1024# Sanity
@@ -18,7 +17,7 @@ def test_basic_prescan_length():
1817

1918

2019
deftest_parser_reparse():
21-
data="<title>Caf\u00E9</title><!--a--><meta charset='utf-8'>".encode('utf-8')
20+
data="<title>Caf\u00E9</title><!--a--><meta charset='utf-8'>".encode()
2221
pad=10240-len(data)+1
2322
data=data.replace(b"-a-",b"-"+ (b"a"*pad)+b"-")
2423
assertlen(data)==10240# Sanity

‎html5lib/tests/test_meta.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importsix
43
try:
54
fromunittest.mockimportMock
65
exceptImportError:
7-
frommockimportMock
6+
fromunittest.mockimportMock
87

98
from .importsupport
109

‎html5lib/tests/test_optionaltags_filter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromhtml5lib.filters.optionaltagsimportFilter
43

‎html5lib/tests/test_parser2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
fromsiximportPY2,text_type
43

‎html5lib/tests/test_sanitizer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importwarnings
43

‎html5lib/tests/test_serializer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importos
43
importjson

‎html5lib/tests/test_stream.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
from .importsupport# noqa
43

@@ -105,7 +104,7 @@ def test_char_ascii():
105104

106105

107106
deftest_char_utf8():
108-
stream=HTMLInputStream('\u2018'.encode('utf-8'),override_encoding='utf-8')
107+
stream=HTMLInputStream('\u2018'.encode(),override_encoding='utf-8')
109108
assertstream.charEncoding[0].name=='utf-8'
110109
assertstream.char()=='\u2018'
111110

@@ -186,7 +185,7 @@ def test_python_issue_20007():
186185
Make sure we have a work-around for Python bug #20007
187186
http://bugs.python.org/issue20007
188187
"""
189-
classFakeSocket(object):
188+
classFakeSocket:
190189
defmakefile(self,_mode,_bufsize=None):
191190
# pylint:disable=unused-argument
192191
returnBytesIO(b"HTTP/1.1 200 Ok\r\n\r\nText")
@@ -205,7 +204,7 @@ def test_python_issue_20007_b():
205204
ifsix.PY2:
206205
return
207206

208-
classFakeSocket(object):
207+
classFakeSocket:
209208
defmakefile(self,_mode,_bufsize=None):
210209
# pylint:disable=unused-argument
211210
returnBytesIO(b"HTTP/1.1 200 Ok\r\n\r\nText")

‎html5lib/tests/test_tokenizer2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importio
43

‎html5lib/tests/test_treeadapters.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
from .importsupport# noqa
43

‎html5lib/tests/test_treewalkers.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__importabsolute_import,division,unicode_literals
21

32
importitertools
43
importsys
@@ -74,11 +73,11 @@ def param_treewalker_six_mix():
7473
# fragment but not using the u'' syntax nor importing unicode_literals
7574
sm_tests= [
7675
('<a href="http://example.com">Example</a>',
77-
[(str('class'),str('test123'))],
76+
[('class','test123')],
7877
'<a>\n class="test123"\n href="http://example.com"\n "Example"'),
7978

8079
('<link href="http://example.com/cow">',
81-
[(str('rel'),str('alternate'))],
80+
[('rel','alternate')],
8281
'<link>\n href="http://example.com/cow"\n rel="alternate"\n "Example"')
8382
]
8483

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp