From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:29 +0000 (-0700)
Subject: Merge branch 'ld/p423'
X-Git-Tag: v2.19.0-rc0~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dcd36473a20e90d02463de5fe33eb94c4c33fa6;p=thirdparty%2Fgit.git

Merge branch 'ld/p423'

Code preparation to make "git p4" closer to be usable with Python 3.

* ld/p423:
  git-p4: python3: fix octal constants
  git-p4: python3: use print() function
  git-p4: python3: basestring workaround
  git-p4: python3: remove backticks
  git-p4: python3: replace dict.has_key(k) with "k in dict"
  git-p4: python3: replace <> with !=
---

6dcd36473a20e90d02463de5fe33eb94c4c33fa6