updade from Atlas repo

This commit is contained in:
Luciano Ramalho
2021-05-21 18:56:12 -03:00
parent c518bf851e
commit 8a330d822b
120 changed files with 2190 additions and 1184 deletions

View File

@@ -20,7 +20,7 @@ if __name__ == '__main__':
while abs(delta) <= epsilon:
delta = next(ap0) - next(ap1)
frac = next(ap_frac)
iteration +=1
iteration += 1
print('iteration: {}\tfraction: {}\tepsilon: {}\tdelta: {}'.
format(iteration, frac, epsilon, delta))

View File

@@ -1,5 +1,5 @@
# tag::COLUMNIZE[]
from typing import Sequence, Tuple, Iterator
from typing import Sequence, Tuple, Iterator
def columnize(sequence: Sequence[str], num_columns: int = 0) -> Iterator[Tuple[str, ...]]:
if num_columns == 0:

View File

@@ -44,8 +44,9 @@ def fibonacci():
if __name__ == '__main__':
for x, y in zip(Fibonacci(), fibonacci()):
assert x == y, '%s != %s' % (x, y)
assert x == y, f'{x} != {y}'
print(x)
if x > 10**10:
break
print('etc...')

View File

@@ -6,7 +6,7 @@ Sentence: iterate over words using a generator function
import re
import reprlib
RE_WORD = re.compile('r\w+')
RE_WORD = re.compile(r'\w+')
class Sentence:
@@ -15,7 +15,7 @@ class Sentence:
self.text = text # <1>
def __repr__(self):
return 'Sentence(%s)' % reprlib.repr(self.text)
return f'Sentence({reprlib.repr(self.text)})'
def __iter__(self):
for match in RE_WORD.finditer(self.text): # <2>

View File

@@ -15,7 +15,7 @@ class Sentence:
self.text = text
def __repr__(self):
return 'Sentence(%s)' % reprlib.repr(self.text)
return f'Sentence({reprlib.repr(self.text)})'
def __iter__(self):
return (match.group() for match in RE_WORD.finditer(self.text))
@@ -29,7 +29,7 @@ def main():
filename = sys.argv[1]
word_number = int(sys.argv[2])
except (IndexError, ValueError):
print('Usage: %s <file-name> <word-number>' % sys.argv[0])
print(f'Usage: {sys.argv[0]} <file-name> <word-number>')
sys.exit(2) # command line usage error
with open(filename, 'rt', encoding='utf-8') as text_file:
s = Sentence(text_file.read())
@@ -38,7 +38,7 @@ def main():
print(word)
break
else:
warnings.warn('last word is #%d, "%s"' % (n, word))
warnings.warn(f'last word is #{n}, {word!r}')
if __name__ == '__main__':
main()

View File

@@ -19,7 +19,7 @@ class Sentence:
self.words = RE_WORD.findall(text)
def __repr__(self):
return 'Sentence(%s)' % reprlib.repr(self.text)
return f'Sentence({reprlib.repr(self.text)})'
def __iter__(self): # <1>
return SentenceIterator(self.words) # <2>
@@ -50,7 +50,7 @@ def main():
filename = sys.argv[1]
word_number = int(sys.argv[2])
except (IndexError, ValueError):
print('Usage: %s <file-name> <word-number>' % sys.argv[0])
print(f'Usage: {sys.argv[0]} <file-name> <word-number>')
sys.exit(2) # command line usage error
with open(filename, 'rt', encoding='utf-8') as text_file:
s = Sentence(text_file.read())
@@ -59,7 +59,7 @@ def main():
print(word)
break
else:
warnings.warn('last word is #%d, "%s"' % (n, word))
warnings.warn(f'last word is #{n}, {word!r}')
if __name__ == '__main__':
main()

View File

@@ -17,14 +17,14 @@ class Sentence:
self.text = text
def __repr__(self):
return 'Sentence(%s)' % reprlib.repr(self.text)
return f'Sentence({reprlib.repr(self.text)})'
def __iter__(self):
word_iter = RE_WORD.finditer(self.text) # <1>
return SentenceIter(word_iter) # <2>
class SentenceIter():
class SentenceIter:
def __init__(self, word_iter):
self.word_iter = word_iter # <3>

View File

@@ -1,11 +1,11 @@
from tree import tree
SPACES = ' ' * 4
HLINE = '\u2500' # ─ BOX DRAWINGS LIGHT HORIZONTAL
HLINE = '\u2500' # ─ BOX DRAWINGS LIGHT HORIZONTAL
HLINE2 = HLINE * 2
ELBOW = f'\u2514{HLINE2} ' # └ BOX DRAWINGS LIGHT UP AND RIGHT
TEE = f'\u251C{HLINE2} ' # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
PIPE = f'\u2502 ' # │ BOX DRAWINGS LIGHT VERTICAL
ELBOW = f'\u2514{HLINE2} ' # └ BOX DRAWINGS LIGHT UP AND RIGHT
TEE = f'\u251C{HLINE2} ' # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
PIPE = '\u2502 ' # │ BOX DRAWINGS LIGHT VERTICAL
def render_lines(tree_iter):

View File

@@ -1,5 +1,3 @@
import pytest
from pretty_tree import tree, render_lines
def test_1_level():
@@ -7,7 +5,7 @@ def test_1_level():
expected = [
'BrokenPipeError',
]
assert expected == result
assert expected == result
def test_2_levels_1_leaf():
@@ -16,7 +14,7 @@ def test_2_levels_1_leaf():
'IndentationError',
'└── TabError',
]
assert expected == result
assert expected == result
def test_3_levels_1_leaf():
@@ -29,7 +27,7 @@ def test_3_levels_1_leaf():
'└── Y',
' └── Z',
]
assert expected == result
assert expected == result
def test_4_levels_1_leaf():
@@ -98,4 +96,5 @@ def test_4_levels_4_leaves():
]
result = list(render_lines(tree(A)))
assert expected == result
assert expected == result

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0, True)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,7 +18,7 @@ def test_2_levels_2_leaves():
('Leaf2', 1, True),
]
result = list(tree(Branch))
assert expected == result
assert expected == result
def test_3_levels_1_leaf():
@@ -31,7 +31,7 @@ def test_3_levels_1_leaf():
('Z', 2, True),
]
result = list(tree(X))
assert expected == result
assert expected == result
def test_4_levels_1_leaf():
@@ -47,7 +47,7 @@ def test_4_levels_1_leaf():
]
result = list(tree(Level0))
assert expected == result
assert expected == result
def test_4_levels_3_leaves():
@@ -69,7 +69,7 @@ def test_4_levels_3_leaves():
]
result = list(tree(A))
assert expected == result
assert expected == result
def test_many_levels_1_leaf():
@@ -87,4 +87,4 @@ def test_many_levels_1_leaf():
assert len(result) == level_count
assert result[0] == ('Root', 0, True)
assert result[-1] == ('Sub99', 99, True)
assert expected == result
assert expected == result

View File

@@ -2,7 +2,7 @@ def tree(cls, level=0, last_in_level=True):
yield cls.__name__, level, last_in_level
subclasses = cls.__subclasses__()
if subclasses:
last = subclasses[-1]
last = subclasses[-1]
for sub_cls in subclasses:
yield from tree(sub_cls, level+1, sub_cls is last)

View File

@@ -5,4 +5,4 @@ def test_1_level():
class One: pass
expected = ['One']
result = list(tree(One))
assert expected == result
assert expected == result

View File

@@ -8,4 +8,4 @@ def display(cls):
if __name__ == '__main__':
display(BaseException)
display(BaseException)

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,4 +18,4 @@ def test_2_levels_2_leaves():
('Leaf2', 1),
]
result = list(tree(Branch))
assert expected == result
assert expected == result

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,4 +18,4 @@ def test_2_levels_2_leaves():
('Leaf2', 1),
]
result = list(tree(Branch))
assert expected == result
assert expected == result

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,7 +18,7 @@ def test_2_levels_2_leaves():
('Leaf2', 1),
]
result = list(tree(Branch))
assert expected == result
assert expected == result
def test_3_levels_1_leaf():
@@ -31,4 +31,4 @@ def test_3_levels_1_leaf():
('Z', 2),
]
result = list(tree(X))
assert expected == result
assert expected == result

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,7 +18,7 @@ def test_2_levels_2_leaves():
('Leaf2', 1),
]
result = list(tree(Branch))
assert expected == result
assert expected == result
def test_3_levels_1_leaf():
@@ -31,7 +31,7 @@ def test_3_levels_1_leaf():
('Z', 2),
]
result = list(tree(X))
assert expected == result
assert expected == result
def test_4_levels_1_leaf():
@@ -47,7 +47,7 @@ def test_4_levels_1_leaf():
]
result = list(tree(Level0))
assert expected == result
assert expected == result
def test_4_levels_3_leaves():
@@ -69,4 +69,5 @@ def test_4_levels_3_leaves():
]
result = list(tree(A))
assert expected == result
assert expected == result

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,7 +18,7 @@ def test_2_levels_2_leaves():
('Leaf2', 1),
]
result = list(tree(Branch))
assert expected == result
assert expected == result
def test_3_levels_1_leaf():
@@ -31,7 +31,7 @@ def test_3_levels_1_leaf():
('Z', 2),
]
result = list(tree(X))
assert expected == result
assert expected == result
def test_4_levels_1_leaf():
@@ -47,7 +47,7 @@ def test_4_levels_1_leaf():
]
result = list(tree(Level0))
assert expected == result
assert expected == result
def test_4_levels_3_leaves():
@@ -69,7 +69,7 @@ def test_4_levels_3_leaves():
]
result = list(tree(A))
assert expected == result
assert expected == result
def test_many_levels_1_leaf():
@@ -87,4 +87,5 @@ def test_many_levels_1_leaf():
assert len(result) == level_count
assert result[0] == ('Root', 0)
assert result[-1] == ('Sub99', 99)
assert expected == result
assert expected == result

View File

@@ -5,7 +5,7 @@ def test_1_level():
class One: pass
expected = [('One', 0)]
result = list(tree(One))
assert expected == result
assert expected == result
def test_2_levels_2_leaves():
@@ -18,7 +18,7 @@ def test_2_levels_2_leaves():
('Leaf2', 1),
]
result = list(tree(Branch))
assert expected == result
assert expected == result
def test_3_levels_1_leaf():
@@ -31,7 +31,7 @@ def test_3_levels_1_leaf():
('Z', 2),
]
result = list(tree(X))
assert expected == result
assert expected == result
def test_4_levels_1_leaf():
@@ -47,7 +47,7 @@ def test_4_levels_1_leaf():
]
result = list(tree(Level0))
assert expected == result
assert expected == result
def test_4_levels_3_leaves():
@@ -69,7 +69,7 @@ def test_4_levels_3_leaves():
]
result = list(tree(A))
assert expected == result
assert expected == result
def test_many_levels_1_leaf():
@@ -87,4 +87,5 @@ def test_many_levels_1_leaf():
assert len(result) == level_count
assert result[0] == ('Root', 0)
assert result[-1] == ('Sub99', 99)
assert expected == result
assert expected == result