Mercurial > vim
view src/testdir/test_makeencoding.py @ 32816:939396a5711c v9.0.1722
patch 9.0.1722: wrong error messages when passing wrong types to count()
Commit: https://github.com/vim/vim/commit/4f389e7c0fe7dfeccfa512a72fa36f9028d57159
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Aug 17 22:10:40 2023 +0200
patch 9.0.1722: wrong error messages when passing wrong types to count()
Problem: wrong error messages when passing wrong types to count()
Solution: fix it
This fixes two problems:
1. When passing wrong type to {ic} argument of count(), two error
messages are given, the second of which is misleading.
2. When passing wrong type to {comp} argument of count(), the error
message doesn't mention that {comp} may be a String.
closes: #12825
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 17 Aug 2023 22:15:03 +0200 |
parents | e71d3bdf3bc3 |
children |
line wrap: on
line source
#!/usr/bin/python # -*- coding: utf-8 -*- # Test program for :make, :grep and :cgetfile. from __future__ import print_function, unicode_literals import locale import io import sys def set_output_encoding(enc=None): """Set the encoding of stdout and stderr arguments: enc -- Encoding name. If omitted, locale.getpreferredencoding() is used. """ if enc is None: enc = locale.getpreferredencoding() def get_text_writer(fo, **kwargs): kw = dict(kwargs) kw.setdefault('errors', 'backslashreplace') # use \uXXXX style kw.setdefault('closefd', False) if sys.version_info[0] < 3: # Work around for Python 2.x # New line conversion isn't needed here. Done in somewhere else. writer = io.open(fo.fileno(), mode='w', newline='', **kw) write = writer.write # save the original write() function enc = locale.getpreferredencoding() def convwrite(s): if isinstance(s, bytes): write(s.decode(enc)) # convert to unistr else: write(s) try: writer.flush() # needed on Windows except IOError: pass writer.write = convwrite else: writer = io.open(fo.fileno(), mode='w', **kw) return writer sys.stdout = get_text_writer(sys.stdout, encoding=enc) sys.stderr = get_text_writer(sys.stderr, encoding=enc) def main(): enc = 'utf-8' if len(sys.argv) > 1: enc = sys.argv[1] set_output_encoding(enc) message_tbl = { 'utf-8': 'ÀÈÌÒÙ こんにちは 你好', 'latin1': 'ÀÈÌÒÙ', 'cp932': 'こんにちは', 'cp936': '你好', } print('Xfoobar.c(10) : %s (%s)' % (message_tbl[enc], enc)) if __name__ == "__main__": main()