NuKVM/yamllint
3
0
Fork 0
mirror of https://github.com/adrienverge/yamllint.git synced 2025-02-16 13:04:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove Unicode marker before strings

Browse Source 
All strings are Unicode in Python 3. No need for u'€', just use '€'.
This commit is contained in:
Dimitri Papadopoulos 2022-10-27 09:45:07 +02:00 committed by Adrien Vergé
parent 5fbf44c203
commit 5b21a3d9ea
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/conf.py
View File

@ -38,7 +38,7 @@ htmlhelp_basename = 'yamllintdoc'
# One entry per manual page. List of tuples # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'yamllint', 'Linter for YAML files', [u'Adrien Vergé'], 1) ('index', 'yamllint', 'Linter for YAML files', ['Adrien Vergé'], 1)
] ]
# -- Build with sphinx automodule without needing to install third-party libs # -- Build with sphinx automodule without needing to install third-party libs

12
tests/test_cli.py
View File

@ -92,12 +92,12 @@ class CommandLineTestCase(unittest.TestCase):
'no-yaml.json': '---\n' 'no-yaml.json': '---\n'
'key: value\n', 'key: value\n',
# non-ASCII chars # non-ASCII chars
u'non-ascii/éçäγλνπ¥/utf-8': ( 'non-ascii/éçäγλνπ¥/utf-8': (
u'---\n' '---\n'
u'- hétérogénéité\n' '- hétérogénéité\n'
u'# 19.99 €\n' '# 19.99 €\n'
u'- お早う御座います。\n' '- お早う御座います。\n'
u'# الأَبْجَدِيَّة العَرَبِيَّة\n').encode('utf-8'), '# الأَبْجَدِيَّة العَرَبِيَّة\n').encode('utf-8'),
# dos line endings yaml # dos line endings yaml
'dos.yml': '---\r\n' 'dos.yml': '---\r\n'
'dos: true', 'dos: true',

12
tests/test_linter.py
View File

@ -31,10 +31,10 @@ class LinterTestCase(unittest.TestCase):
linter.run(b'test: document', self.fake_config()) linter.run(b'test: document', self.fake_config())
def test_run_on_unicode(self): def test_run_on_unicode(self):
linter.run(u'test: document', self.fake_config()) linter.run('test: document', self.fake_config())
def test_run_on_stream(self): def test_run_on_stream(self):
linter.run(io.StringIO(u'hello'), self.fake_config()) linter.run(io.StringIO('hello'), self.fake_config())
def test_run_on_int(self): def test_run_on_int(self):
self.assertRaises(TypeError, linter.run, 42, self.fake_config()) self.assertRaises(TypeError, linter.run, 42, self.fake_config())
@ -44,14 +44,14 @@ class LinterTestCase(unittest.TestCase):
['h', 'e', 'l', 'l', 'o'], self.fake_config()) ['h', 'e', 'l', 'l', 'o'], self.fake_config())
def test_run_on_non_ascii_chars(self): def test_run_on_non_ascii_chars(self):
s = (u'- hétérogénéité\n' s = ('- hétérogénéité\n'
u'# 19.99 €\n') '# 19.99 €\n')
linter.run(s, self.fake_config()) linter.run(s, self.fake_config())
linter.run(s.encode('utf-8'), self.fake_config()) linter.run(s.encode('utf-8'), self.fake_config())
linter.run(s.encode('iso-8859-15'), self.fake_config()) linter.run(s.encode('iso-8859-15'), self.fake_config())
s = (u'- お早う御座います。\n' s = ('- お早う御座います。\n'
u'# الأَبْجَدِيَّة العَرَبِيَّة\n') '# الأَبْجَدِيَّة العَرَبِيَّة\n')
linter.run(s, self.fake_config()) linter.run(s, self.fake_config())
linter.run(s.encode('utf-8'), self.fake_config()) linter.run(s.encode('utf-8'), self.fake_config())

4
yamllint/__init__.py
View File

@ -24,7 +24,7 @@ APP_NAME = 'yamllint'
APP_VERSION = '1.28.0' APP_VERSION = '1.28.0'
APP_DESCRIPTION = __doc__ APP_DESCRIPTION = __doc__
__author__ = u'Adrien Vergé' __author__ = 'Adrien Vergé'
__copyright__ = u'Copyright 2022, Adrien Vergé' __copyright__ = 'Copyright 2022, Adrien Vergé'
__license__ = 'GPLv3' __license__ = 'GPLv3'
__version__ = APP_VERSION __version__ = APP_VERSION

2
yamllint/rules/quoted_strings.py
View File

@ -166,7 +166,7 @@ def VALIDATE(conf):
return 'cannot use both "required: false" and "extra-allowed"' return 'cannot use both "required: false" and "extra-allowed"'
DEFAULT_SCALAR_TAG = u'tag:yaml.org,2002:str' DEFAULT_SCALAR_TAG = 'tag:yaml.org,2002:str'
# https://stackoverflow.com/a/36514274 # https://stackoverflow.com/a/36514274
yaml.resolver.Resolver.add_implicit_resolver( yaml.resolver.Resolver.add_implicit_resolver(