kallithea Changeset - c387989f868f

Changeset - c387989f868f

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich (mads) - 5 years ago 2020-10-28 14:58:18
mads@kiilerich.com

Grafted from: b9c601fdd709

git: fix upload-pack content-type with py3

It is checked earlier that git_command is one of two string constants, and with
py3, things are much simpler and we don't have to consider string coersion.

Reported and debugged by Valentin.

1 file changed with 2 insertions and 2 deletions:

kallithea/lib/middleware/pygrack.py

0 comments (0 inline, 0 general)

kallithea/lib/middleware/pygrack.py

➞

Show inline comments

@@ @@ -122,13 +122,13 @@ class GitRepository(object): @@
                 starting_values=[ascii_bytes(packet_len + server_advert + '0000')]
+            )
         except EnvironmentError as e:
             log.error(traceback.format_exc())
             raise exc.HTTPExpectationFailed()
         resp = Response()
-        resp.content_type = 'application/x-%s-advertisement' % str(git_command)
         resp.content_type = 'application/x-%s-advertisement' % git_command
         resp.charset = None
         resp.app_iter = out
         return resp
     def backend(self, req, environ):
         """
@@ @@ -172,13 +172,13 @@ class GitRepository(object): @@
             from dulwich.server import update_server_info
             repo = get_repo(self.content_path)
             if repo:
                 update_server_info(repo._repo)
         resp = Response()
-        resp.content_type = 'application/x-%s-result' % git_command.encode('utf-8')
         resp.content_type = 'application/x-%s-result' % git_command
         resp.charset = None
         resp.app_iter = out
         return resp
     def __call__(self, environ, start_response):
         req = Request(environ)

0 comments (0 inline, 0 general)