From 1030e0a7e13c4ec3fdc48b9010e9892833850db9 Mon Sep 17 00:00:00 2001 From: Nejc Habjan Date: Sun, 20 Sep 2020 23:17:36 +0200 Subject: chore(cli): remove python2 code --- gitlab/v4/cli.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gitlab/v4/cli.py') diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py index 51416f1..fe5ab80 100644 --- a/gitlab/v4/cli.py +++ b/gitlab/v4/cli.py @@ -85,11 +85,7 @@ class GitlabCLI(object): try: project = self.gl.projects.get(int(self.args["project_id"]), lazy=True) data = project.exports.get().download() - if hasattr(sys.stdout, "buffer"): - # python3 - sys.stdout.buffer.write(data) - else: - sys.stdout.write(data) + sys.stdout.buffer.write(data) except Exception as e: cli.die("Impossible to download the export", e) -- cgit v1.2.1 From 0733ec6cad5c11b470ce6bad5dc559018ff73b3c Mon Sep 17 00:00:00 2001 From: Nejc Habjan Date: Thu, 1 Oct 2020 01:46:42 +0200 Subject: fix(cli): write binary data to stdout buffer --- gitlab/v4/cli.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gitlab/v4/cli.py') diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py index fe5ab80..6172f93 100644 --- a/gitlab/v4/cli.py +++ b/gitlab/v4/cli.py @@ -436,5 +436,7 @@ def run(gl, what, action, args, verbose, output, fields): printer.display(get_dict(data, fields), verbose=verbose, obj=data) elif isinstance(data, str): print(data) + elif isinstance(data, bytes): + sys.stdout.buffer.write(data) elif hasattr(data, "decode"): print(data.decode()) -- cgit v1.2.1