mirror of
https://github.com/davidhalter/parso.git
synced 2026-01-11 05:53:32 +08:00
Refactor splitlines -> split_lines.
This commit is contained in:
@@ -3,7 +3,7 @@ import logging
|
||||
|
||||
import pytest
|
||||
|
||||
from parso.utils import splitlines
|
||||
from parso.utils import split_lines
|
||||
from parso import cache
|
||||
from parso import load_grammar
|
||||
from parso.python.diff import DiffParser
|
||||
@@ -58,13 +58,13 @@ class Differ(object):
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
self.lines = splitlines(code, keepends=True)
|
||||
self.lines = split_lines(code, keepends=True)
|
||||
self.module = parse(code, diff_cache=True, cache=True)
|
||||
return self.module
|
||||
|
||||
def parse(self, code, copies=0, parsers=0, expect_error_leaves=False):
|
||||
logging.debug('differ: parse copies=%s parsers=%s', copies, parsers)
|
||||
lines = splitlines(code, keepends=True)
|
||||
lines = split_lines(code, keepends=True)
|
||||
diff_parser = DiffParser(
|
||||
self.grammar._pgen_grammar,
|
||||
self.grammar._tokenizer,
|
||||
|
||||
@@ -6,7 +6,7 @@ import pytest
|
||||
from parso._compatibility import u
|
||||
from parso import parse
|
||||
from parso.python import tree
|
||||
from parso.utils import splitlines
|
||||
from parso.utils import split_lines
|
||||
|
||||
|
||||
def test_basic_parsing(each_version):
|
||||
@@ -153,7 +153,7 @@ def test_open_string_literal(each_version, code):
|
||||
"""
|
||||
Testing mostly if removing the last newline works.
|
||||
"""
|
||||
lines = splitlines(code, keepends=True)
|
||||
lines = split_lines(code, keepends=True)
|
||||
end_pos = (len(lines), len(lines[-1]))
|
||||
module = parse(code, version=each_version)
|
||||
assert module.get_code() == code
|
||||
|
||||
@@ -5,7 +5,7 @@ from textwrap import dedent
|
||||
import pytest
|
||||
|
||||
from parso._compatibility import py_version
|
||||
from parso.utils import splitlines, parse_version_string
|
||||
from parso.utils import split_lines, parse_version_string
|
||||
from parso.python.token import (
|
||||
NAME, NEWLINE, STRING, INDENT, DEDENT, ERRORTOKEN, ENDMARKER, ERROR_DEDENT)
|
||||
from parso.python import tokenize
|
||||
@@ -201,7 +201,7 @@ def test_error_literal():
|
||||
def test_endmarker_end_pos():
|
||||
def check(code):
|
||||
tokens = _get_token_list(code)
|
||||
lines = splitlines(code)
|
||||
lines = split_lines(code)
|
||||
assert tokens[-1].end_pos == (len(lines), len(lines[-1]))
|
||||
|
||||
check('#c')
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
from codecs import BOM_UTF8
|
||||
|
||||
from parso.utils import splitlines, source_to_unicode
|
||||
from parso.utils import split_lines, source_to_unicode
|
||||
import parso
|
||||
|
||||
|
||||
def test_splitlines_no_keepends():
|
||||
assert splitlines('asd\r\n') == ['asd', '']
|
||||
assert splitlines('asd\r\n\f') == ['asd', '\f']
|
||||
assert splitlines('\fasd\r\n') == ['\fasd', '']
|
||||
assert splitlines('') == ['']
|
||||
assert splitlines('\n') == ['', '']
|
||||
def test_split_lines_no_keepends():
|
||||
assert split_lines('asd\r\n') == ['asd', '']
|
||||
assert split_lines('asd\r\n\f') == ['asd', '\f']
|
||||
assert split_lines('\fasd\r\n') == ['\fasd', '']
|
||||
assert split_lines('') == ['']
|
||||
assert split_lines('\n') == ['', '']
|
||||
|
||||
|
||||
def test_splitlines_keepends():
|
||||
assert splitlines('asd\r\n', keepends=True) == ['asd\r\n', '']
|
||||
assert splitlines('asd\r\n\f', keepends=True) == ['asd\r\n', '\f']
|
||||
assert splitlines('\fasd\r\n', keepends=True) == ['\fasd\r\n', '']
|
||||
assert splitlines('', keepends=True) == ['']
|
||||
assert splitlines('\n', keepends=True) == ['\n', '']
|
||||
def test_split_lines_keepends():
|
||||
assert split_lines('asd\r\n', keepends=True) == ['asd\r\n', '']
|
||||
assert split_lines('asd\r\n\f', keepends=True) == ['asd\r\n', '\f']
|
||||
assert split_lines('\fasd\r\n', keepends=True) == ['\fasd\r\n', '']
|
||||
assert split_lines('', keepends=True) == ['']
|
||||
assert split_lines('\n', keepends=True) == ['\n', '']
|
||||
|
||||
|
||||
def test_source_to_unicode_unicode_text():
|
||||
|
||||
Reference in New Issue
Block a user