Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions repo2docker/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from functools import partial
from shutil import copy2, copystat

import chardet
import charset_normalizer
from traitlets import Integer, TraitError


Expand Down Expand Up @@ -94,21 +94,13 @@ def chdir(path):
def open_guess_encoding(path):
"""
Open a file in text mode, specifying its encoding,
that we guess using chardet.
that we guess using charset_normalizer.
"""
detector = chardet.universaldetector.UniversalDetector()
with open(path, "rb") as f:
for line in f.readlines():
detector.feed(line)
if detector.done:
break
detector.close()
detector = charset_normalizer.from_fp(f)

file = open(path, encoding=detector.result["encoding"])
try:
with open(path, encoding=detector.best().encoding) as file:
yield file
finally:
file.close()


def validate_and_generate_port_mapping(port_mappings):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def get_identifier(json):
name="jupyter-repo2docker",
version=versioneer.get_version(),
install_requires=[
"chardet",
"charset-normalizer",
"docker!=5.0.0",
"entrypoints",
"escapism",
Expand Down