Merge branch 'ld/p423'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
commit6dcd36473a20e90d02463de5fe33eb94c4c33fa6
treeef06b293d991cfeab8976232ae2e77a7debd3c49
parent5d459c0cec3357fdcbbe7462a5342b1d60ba5114
parentdb2d997efa43596fe5860d1b1c0c410e99d96f67
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 !=