Skip to content

Commit

Permalink
Replaced encoding: utf8 -> utf-8
Browse files Browse the repository at this point in the history
  • Loading branch information
miso-belica committed Nov 17, 2016
1 parent fe26265 commit 32cee98
Show file tree
Hide file tree
Showing 55 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ $ sumy_eval --help # for more info
Or you can use sumy like a library in your project.

```python
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Or you can use sumy like a library in your project.

.. code:: python
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-
from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
18 changes: 9 additions & 9 deletions sumy/_compat.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down Expand Up @@ -42,9 +42,9 @@ def unicode_compatible(cls):
"""
if PY3:
cls.__str__ = cls.__unicode__
cls.__bytes__ = lambda self: self.__str__().encode("utf8")
cls.__bytes__ = lambda self: self.__str__().encode("utf-8")
else:
cls.__str__ = lambda self: self.__unicode__().encode("utf8")
cls.__str__ = lambda self: self.__unicode__().encode("utf-8")

return cls

Expand All @@ -57,7 +57,7 @@ def to_bytes(object):
if isinstance(object, bytes):
return object
elif isinstance(object, unicode):
return object.encode("utf8")
return object.encode("utf-8")
else:
# try encode instance to bytes
return instance_to_bytes(object)
Expand All @@ -67,7 +67,7 @@ def to_unicode(object):
if isinstance(object, unicode):
return object
elif isinstance(object, bytes):
return object.decode("utf8")
return object.decode("utf-8")
else:
# try decode instance to unicode
return instance_to_unicode(object)
Expand All @@ -78,12 +78,12 @@ def instance_to_bytes(instance):
if hasattr(instance, "__bytes__"):
return bytes(instance)
elif hasattr(instance, "__str__"):
return unicode(instance).encode("utf8")
return unicode(instance).encode("utf-8")
else:
if hasattr(instance, "__str__"):
return bytes(instance)
elif hasattr(instance, "__unicode__"):
return unicode(instance).encode("utf8")
return unicode(instance).encode("utf-8")

return to_bytes(repr(instance))

Expand All @@ -93,11 +93,11 @@ def instance_to_unicode(instance):
if hasattr(instance, "__str__"):
return unicode(instance)
elif hasattr(instance, "__bytes__"):
return bytes(instance).decode("utf8")
return bytes(instance).decode("utf-8")
else:
if hasattr(instance, "__unicode__"):
return unicode(instance)
elif hasattr(instance, "__str__"):
return bytes(instance).decode("utf8")
return bytes(instance).decode("utf-8")

return to_unicode(repr(instance))
2 changes: 1 addition & 1 deletion sumy/evaluation/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
4 changes: 2 additions & 2 deletions sumy/evaluation/__main__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

"""
Sumy - evaluation of automatic text summary.
Expand Down Expand Up @@ -204,7 +204,7 @@ def handle_arguments(args):
parser = parser(document_content, Tokenizer(args["--language"]))

with open(args["<reference_summary>"], "rb") as file:
reference_summmary = file.read().decode("utf8")
reference_summmary = file.read().decode("utf-8")

return summarizer_builder(parser, args["--language"]), parser.document, items_count, reference_summmary

Expand Down
2 changes: 1 addition & 1 deletion sumy/evaluation/content_based.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/evaluation/coselection.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/evaluation/rouge.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/models/dom/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/models/dom/_document.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/models/dom/_paragraph.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/models/dom/_sentence.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/models/tf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/nlp/stemmers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
10 changes: 5 additions & 5 deletions sumy/nlp/stemmers/czech.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

"""
Czech stemmer
Expand Down Expand Up @@ -26,7 +26,7 @@

def stem_word(word, aggressive=False):
if not isinstance(word, unicode):
word = word.decode("utf8")
word = word.decode("utf-8")

if not WORD_PATTERN.match(word):
return word
Expand Down Expand Up @@ -196,9 +196,9 @@ def _palatalize(word):

if __name__ == '__main__':
if len(sys.argv) != 2 or sys.argv[1] not in ("light", "aggressive"):
sys.exit(__doc__.encode("utf8"))
sys.exit(__doc__.encode("utf-8"))

aggressive_stemming = bool(sys.argv[1] == "aggressive")
for line in sys.stdin:
words = tuple(w.decode("utf8") + " " + stem_word(w, aggressive_stemming) for w in line.split())
print(*map(lambda s: s.encode("utf8"), words))
words = tuple(w.decode("utf-8") + " " + stem_word(w, aggressive_stemming) for w in line.split())
print(*map(lambda s: s.encode("utf-8"), words))
2 changes: 1 addition & 1 deletion sumy/nlp/tokenizers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/parsers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/parsers/html.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/parsers/parser.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/parsers/plaintext.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/_summarizer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/edmundson.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/edmundson_cue.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/edmundson_key.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/edmundson_location.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/edmundson_title.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/kl.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/lex_rank.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/lsa.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/luhn.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/random.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/sum_basic.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/summarizers/text_rank.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion sumy/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_evaluation.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_models/test_dom.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_models/test_tf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_parsers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_stemmers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_edmundson.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_kl.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_lex_rank.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_lsa.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_luhn.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_random.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_sum_basic.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
2 changes: 1 addition & 1 deletion tests/test_summarizers/test_text_rank.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division, print_function, unicode_literals
Expand Down
Loading

0 comments on commit 32cee98

Please sign in to comment.