Re: [PATCH 2/2] git-p4.py: support Python 2.4
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Jan 26, 2013, 12:48 UTC
- Message-ID
- <20130126124854.GB31052@padd.com>
- In-Reply-To
- <1359146641-27810-3-git-send-email-drafnel@gmail.com>
drafnel@gmail.com wrote on Fri, 25 Jan 2013 12:44 -0800:
Show 12 quoted lines
> Python 2.4 lacks the following features: > > subprocess.check_call > struct.pack_into > > Take a cue from 460d1026 and provide an implementation of the > CalledProcessError exception. Then replace the calls to > subproccess.check_call with calls to subprocess.call that check the return > status and raise a CalledProcessError exception if necessary. > > The struct.pack_into in t/9802 can be converted into a single struct.pack > call which is available in Python 2.4.
Excellent. Should have used struct.pack() from the get-go.
Acked-by: Pete Wyckoff <pw@padd.com>
Show 21 quoted lines
> diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
> index 21924df..be299dc 100755
> --- a/t/t9802-git-p4-filetype.sh
> +++ b/t/t9802-git-p4-filetype.sh
> @@ -105,12 +105,13 @@ build_gendouble() {
> cat >gendouble.py <<-\EOF
> import sys
> import struct
> - import array
>
> - s = array.array("c", '\0' * 26)
> - struct.pack_into(">L", s, 0, 0x00051607) # AppleDouble
> - struct.pack_into(">L", s, 4, 0x00020000) # version 2
> - s.tofile(sys.stdout)
> + s = struct.pack(">LL18s",
> + 0x00051607, # AppleDouble
> + 0x00020000, # version 2
> + "" # pad to 26 bytes
> + )
> + sys.stdout.write(s);
> EOFOne stray semicolon.
In terms of maintenance, I'll not run tests with 2.4 or 2.5 myself, but maybe you would be willing to check an RC candidate each release?
-- Pete