samba.git/python/samba/gp_parse, branch talloc-2.3.0

gp_inf: Read/write files with a UTF-16LE BOM in GptTmpl.inf

2019-07-19T02:20:47+00:00

Regression caused by 16596842a62bec0a9d974c48d64000e3c079254e

[MS-GPSB] 2.2 Message Syntax says that you have to write a BOM which I
didn't do up until this patch. UTF-16 as input encoding was marked much
higher up in the inheritance tree, which got overriden with the Python 3
fixes. I've now marked the encoding much more obviously for this file.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14004

Signed-off-by: Garming Sam 
Reviewed-by: Gary Lockyer 

Autobuild-User(master): Gary Lockyer 
Autobuild-Date(master): Fri Jul 19 02:20:47 UTC 2019 on sn-devel-184

gpo: Parse GPT.INI with Latin-1

2019-03-12T00:42:20+00:00

For some reason the French version of RSAT turns accents into ISO-8859-1.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13806

Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett

py3: io.open takes a numeric buffering argument at index 2

2019-03-12T00:42:20+00:00

It's unsure why this doesn't fail generically, but it fails on my machine sometimes...

Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett

python/samba/gp_parse: PY2/PY3 Decode only when necessary

2018-11-05T19:05:24+00:00

In python2 we decode str types in load_xml, in python3 these are
str class(s) which we cannot decode.

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall

python/samba/gp_parse: Fix mulitple encode step with write_section

2018-11-05T19:05:24+00:00

In python2 as far as I can see GptTmplInfParser.write_binary more
or less works by accident.

write_binary creates a writer for the 'utf8' codec, such a writer
should consume unicode and emit utf8 encoded bytes. This writer
is passed to each of the sections managed by GptTmplInfParser as
follows

    def write_binary(self, filename):
        with codecs.open(filename, 'wb+',
                         self.encoding) as f:
            for s in self.sections:
                self.sections[s].write_section(s, f)

And each section type itself is encoding its result to 'utf-16-le'
e.g.
    class UnicodeParam(AbstractParam):
         def write_section(self, header, fp):
            fp.write(u'[Unicode]\r\nUnicode=yes\r\n'.encode(self.encoding)

But this makes little sense, it seems like sections are encoded to one
encoding but the total file is supposed to be encoded as ut8??? Also
having an encoding per ParamType doesn't seem correct.

Bizarely in PY2 this works and it actually encodes the whole file as utf-16le
In PY3 you can't do this as the writer wants to deal with strings not bytes
(after the extra encode phase in 'write_section'.

So, changes here are to remove the unnecessary encoding in each 'write_section'
method, additionally in GptTmplInfParser.write_binary the
codecs.open call now uses the correct codec (e.g. 'utf-16-le') to write

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall

python/samab/gp_parse: remove unused code

2018-11-05T19:05:23+00:00

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall

python/samba/gp_parse: Use csv.reader for parsing cvs files

2018-11-05T19:05:23+00:00

The previous version here was using UnicodeReader which was
wrapping the UTF8Recoder class and passing that to csv.reader.
It looks like the intention was to read a bytestream in a
certain encoding and then reencode it to a different encoding.
And then UnicodeReader creates unicode from the newly encoded stream.
This is unnecssary, we know the encoding of the bytesstream and
codec.getreader will happily consume the bytstream and give back
unicode. The unicode can be fed directly into csv.writer.

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall

python/samba/gp_parse: PY2/PY3 compat porting for gp_init.py

2018-11-05T19:05:23+00:00

Fixes
1) use compat versions of ConfigParser and StringIO
2) fix sort list of XML Elements
3) open file needs to be opened in binary mode as write_pretty_xml
   routing uses BytesIO() object.

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall

python/samba/gp_parse: PY3 open file non-binary mode for write_binary

2018-11-05T19:05:23+00:00

Although this is unintuitive it's because we are writing unicode
not bytes (both in PY2 & PY3). using the 'b' mode causes an error in
PY3.

In PY3 we can define the encoding, but not in PY2.

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall

python/samba/gp_parse: PY3 file -> open

2018-11-05T19:05:23+00:00

'file' no longer exists in PY3 replace with 'open'

Signed-off-by: Noel Power 
Reviewed-by: Douglas Bagnall