Skip to content

Commit b29eaad

Browse files
SoluMilkenSoluMilken
authored
Merge pull request #24 from Yoctol/shorter_name
remove redudant text normalizer
2 parents eebbd71 + 083ea77 commit b29eaad

60 files changed

Lines changed: 163 additions & 163 deletions

Some content is hidden

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

text_normalizer/text_normalizer_collection_library/__init__.py renamed to text_normalizer/collection/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
from .basic_text_normalizer_collection import ( # noqa
1+
from .basic import ( # noqa
22
basic_text_normalizer_collection,
33
number_with_digits_text_normalizer_collection,
44
)
5-
from .eng_basic_text_normalizer_collection import eng_basic_text_normalizer_collection # noqa
6-
from .punctuation_keeping_text_normalizer_collection import ( # noqa
5+
from .eng_basic import eng_basic_text_normalizer_collection # noqa
6+
from .punctuation_keeping import ( # noqa
77
full_punctuation_keeping_text_normalizer_collection,
88
simplified_punctuation_keeping_text_normalizer_collection,
99
number_with_digits_n_simplified_punctuation_text_normalizer_collection,
1010
)
11-
from .charactor_text_normalizer_collection import ( # noqa
11+
from .charactor import ( # noqa
1212
chinese_charactor_text_normalizer_collection_1,
1313
chinese_charactor_text_normalizer_collection_2,
1414
chinese_charactor_text_normalizer_collection_3,
1515
chinese_charactor_text_normalizer_collection_4,
1616
)
17-
from .unicode_text_normalizer_collection import ( # noqa
17+
from .unicode_mapping import ( # noqa
1818
u_zh_text_normalizer_collection_1,
1919
u_zh_text_normalizer_collection_2,
2020
u_zh_text_normalizer_collection_3,

text_normalizer/text_normalizer_collection_library/base_text_normalizer_collection.py renamed to text_normalizer/collection/base_collection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import List
22

33

4-
class BaseTextNormalizerCollection(object):
4+
class BaseCollection(object):
55

66
def __init__(self):
77
self.text_normalizers = []

text_normalizer/text_normalizer_collection_library/basic_text_normalizer_collection.py renamed to text_normalizer/collection/basic.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base_text_normalizer_collection import BaseTextNormalizerCollection
2-
from text_normalizer.text_normalizer_library import (
1+
from .base_collection import BaseCollection
2+
from ..library import (
33
whitespace_char_text_normalizer,
44
float_with_space_text_normalizer,
55
int_with_space_text_normalizer,
@@ -12,7 +12,7 @@
1212
)
1313

1414

15-
basic_text_normalizer_collection = BaseTextNormalizerCollection()
15+
basic_text_normalizer_collection = BaseCollection()
1616
basic_text_normalizer_collection.add_text_normalizers(
1717
text_normalizers=[
1818
eng_lowercase_text_normalizer,
@@ -25,7 +25,7 @@
2525
],
2626
)
2727

28-
number_with_digits_text_normalizer_collection = BaseTextNormalizerCollection()
28+
number_with_digits_text_normalizer_collection = BaseCollection()
2929
number_with_digits_text_normalizer_collection.add_text_normalizers(
3030
text_normalizers=[
3131
eng_lowercase_text_normalizer,

text_normalizer/text_normalizer_collection_library/charactor_text_normalizer_collection.py renamed to text_normalizer/collection/charactor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base_text_normalizer_collection import BaseTextNormalizerCollection
2-
from text_normalizer.text_normalizer_library import (
1+
from .base_collection import BaseCollection
2+
from ..library import (
33
whitespace_char_text_normalizer,
44
float_text_normalizer,
55
int_text_normalizer,
@@ -12,7 +12,7 @@
1212
)
1313

1414

15-
chinese_charactor_text_normalizer_collection_1 = BaseTextNormalizerCollection()
15+
chinese_charactor_text_normalizer_collection_1 = BaseCollection()
1616
chinese_charactor_text_normalizer_collection_1.add_text_normalizers(
1717
text_normalizers=[
1818
eng_lowercase_text_normalizer,
@@ -25,7 +25,7 @@
2525
)
2626

2727

28-
chinese_charactor_text_normalizer_collection_2 = BaseTextNormalizerCollection()
28+
chinese_charactor_text_normalizer_collection_2 = BaseCollection()
2929
chinese_charactor_text_normalizer_collection_2.add_text_normalizers(
3030
text_normalizers=[
3131
eng_lowercase_text_normalizer,
@@ -38,7 +38,7 @@
3838
)
3939

4040

41-
chinese_charactor_text_normalizer_collection_3 = BaseTextNormalizerCollection()
41+
chinese_charactor_text_normalizer_collection_3 = BaseCollection()
4242
chinese_charactor_text_normalizer_collection_3.add_text_normalizers(
4343
text_normalizers=[
4444
eng_lowercase_text_normalizer,
@@ -51,7 +51,7 @@
5151
)
5252

5353

54-
chinese_charactor_text_normalizer_collection_4 = BaseTextNormalizerCollection()
54+
chinese_charactor_text_normalizer_collection_4 = BaseCollection()
5555
chinese_charactor_text_normalizer_collection_4.add_text_normalizers(
5656
text_normalizers=[
5757
eng_lowercase_text_normalizer,

text_normalizer/text_normalizer_collection_library/eng_basic_text_normalizer_collection.py renamed to text_normalizer/collection/eng_basic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
from .base_text_normalizer_collection import BaseTextNormalizerCollection
2-
from text_normalizer.text_normalizer_library import (
1+
from .base_collection import BaseCollection
2+
from ..library import (
33
whitespace_char_text_normalizer,
44
pure_strip_text_normalizer,
55
eng_lowercase_text_normalizer,
66
)
77

88

9-
eng_basic_text_normalizer_collection = BaseTextNormalizerCollection()
9+
eng_basic_text_normalizer_collection = BaseCollection()
1010
eng_basic_text_normalizer_collection.add_text_normalizers(
1111
text_normalizers=[
1212
eng_lowercase_text_normalizer,

text_normalizer/text_normalizer_collection_library/punctuation_keeping_text_normalizer_collection.py renamed to text_normalizer/collection/punctuation_keeping.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base_text_normalizer_collection import BaseTextNormalizerCollection
2-
from text_normalizer.text_normalizer_library import (
1+
from .base_collection import BaseCollection
2+
from ..library import (
33
whitespace_char_text_normalizer,
44
float_with_space_text_normalizer,
55
int_with_space_text_normalizer,
@@ -12,7 +12,7 @@
1212
)
1313

1414

15-
full_punctuation_keeping_text_normalizer_collection = BaseTextNormalizerCollection()
15+
full_punctuation_keeping_text_normalizer_collection = BaseCollection()
1616
full_punctuation_keeping_text_normalizer_collection.add_text_normalizers(
1717
text_normalizers=[
1818
eng_lowercase_text_normalizer,
@@ -25,7 +25,7 @@
2525
)
2626

2727

28-
simplified_punctuation_keeping_text_normalizer_collection = BaseTextNormalizerCollection()
28+
simplified_punctuation_keeping_text_normalizer_collection = BaseCollection()
2929
simplified_punctuation_keeping_text_normalizer_collection.add_text_normalizers(
3030
text_normalizers=[
3131
eng_lowercase_text_normalizer,
@@ -39,7 +39,7 @@
3939

4040

4141
number_with_digits_n_simplified_punctuation_text_normalizer_collection = \
42-
BaseTextNormalizerCollection()
42+
BaseCollection()
4343
number_with_digits_n_simplified_punctuation_text_normalizer_collection.add_text_normalizers(
4444
text_normalizers=[
4545
eng_lowercase_text_normalizer,

text_normalizer/text_normalizer_collection_library/test/__init__.py renamed to text_normalizer/collection/test/__init__.py

File renamed without changes.

text_normalizer/text_normalizer_collection_library/test/test_base_text_normalizer_collection.py renamed to text_normalizer/collection/test/test_base_collection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
from unittest.mock import Mock, call
33

44
from unittest import TestCase
5-
from ..base_text_normalizer_collection import BaseTextNormalizerCollection
5+
from ..base_collection import BaseCollection
66

77

8-
class TestBaseTextNormalizerCollection(TestCase):
8+
class TestBaseCollection(TestCase):
99

1010
def setUp(self):
11-
self.base_text_normalizer_collection = BaseTextNormalizerCollection()
11+
self.base_text_normalizer_collection = BaseCollection()
1212
self.example_sentence = "0123456789"
1313
self.text_normalizers = Mock()
1414
self.text_normalizer_0 = Mock()

text_normalizer/text_normalizer_collection_library/test/test_basic_text_normalizer_collection.py renamed to text_normalizer/collection/test/test_basic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from unittest import TestCase
33

4-
from ..basic_text_normalizer_collection import (
4+
from ..basic import (
55
basic_text_normalizer_collection,
66
number_with_digits_text_normalizer_collection,
77
)

text_normalizer/text_normalizer_collection_library/test/test_charactor_text_normalizer_collection.py renamed to text_normalizer/collection/test/test_charactor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from unittest import TestCase
33

4-
from ..charactor_text_normalizer_collection import (
4+
from ..charactor import (
55
chinese_charactor_text_normalizer_collection_1,
66
chinese_charactor_text_normalizer_collection_2,
77
chinese_charactor_text_normalizer_collection_3,

0 commit comments

Comments
 (0)