Skip to content

Remove Python 2 compatibility shims #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 17, 2020
Merged

Remove Python 2 compatibility shims #56

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
58bce6b
Remove and replace compat.izip
Harmon758 Feb 16, 2020
73a9f79
Remove and replace izip in TestPack
Harmon758 Feb 16, 2020
4a692fd
Remove and replace compat.xrange
Harmon758 Feb 16, 2020
3d14cc8
Remove and replace compat.buffer
Harmon758 Feb 16, 2020
d1c20d5
Remove compat.memoryview
Harmon758 Feb 16, 2020
59c053e
Remove and replace compat.to_bytes
Harmon758 Feb 16, 2020
321c3b4
Remove and replace compat.MAXSIZE
Harmon758 Feb 16, 2020
c412680
Remove and replace encoding.string_types
Harmon758 Feb 16, 2020
77dc809
Remove and replace encoding.text_type
Harmon758 Feb 16, 2020
db9a65e
Remove compat.PY3
Harmon758 Feb 16, 2020
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
Prev Previous commit
Next Next commit
Remove and replace encoding.text_type
  • Loading branch information
@Harmon758
Harmon758 committed Feb 16, 2020
commit 77dc809542d15c40dbe60ff55cd830082c3ad904
15 changes: 2 additions & 13 deletions gitdb/utils/encoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
from gitdb.utils import compat

if compat.PY3:
text_type = str
else:
text_type = unicode


def force_bytes(data, encoding="ascii"):
if isinstance(data, bytes):
return data
Expand All @@ -17,13 +9,10 @@ def force_bytes(data, encoding="ascii"):


def force_text(data, encoding="utf-8"):
if isinstance(data, text_type):
if isinstance(data, str):
return data

if isinstance(data, bytes):
return data.decode(encoding)

if compat.PY3:
return text_type(data, encoding)
else:
return text_type(data)
return str(data, encoding)