[Libreoffice-commits] core.git: writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jul 27 11:43:13 UTC 2018
writerfilter/source/ooxml/README | 2 +-
writerfilter/source/ooxml/factory_ns.py | 1 +
writerfilter/source/ooxml/factoryimpl_ns.py | 1 +
writerfilter/source/ooxml/qnametostr.py | 1 +
writerfilter/source/ooxml/resourceids.py | 1 +
writerfilter/source/ooxml/tox.ini | 2 +-
6 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5d23851b572346d35c9fcf5a8266db38cb5f8555
Author: Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Fri Jul 27 09:35:20 2018 +0200
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Fri Jul 27 13:42:41 2018 +0200
writerfilter python: 2 blank lines after class/function definition
To be in sync with PEP8.
Change-Id: If712dc4eac675abb011543f2ea54a2de085e6ad8
Reviewed-on: https://gerrit.libreoffice.org/58163
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins
diff --git a/writerfilter/source/ooxml/README b/writerfilter/source/ooxml/README
index fd71540c4cdd..c72b341aef65 100644
--- a/writerfilter/source/ooxml/README
+++ b/writerfilter/source/ooxml/README
@@ -7,7 +7,7 @@ This directory uses the PEP 8 (see
Please run
----
-pep8 *.py
+pycodestyle *.py
----
before committing.
diff --git a/writerfilter/source/ooxml/factory_ns.py b/writerfilter/source/ooxml/factory_ns.py
index 507f8f012430..17ae4e756288 100644
--- a/writerfilter/source/ooxml/factory_ns.py
+++ b/writerfilter/source/ooxml/factory_ns.py
@@ -67,6 +67,7 @@ protected:
}}
#endif //INCLUDED_OOXML_FACTORY_%s_HXX""" % nsToken.upper())
+
modelPath = sys.argv[1]
filePath = sys.argv[2]
model = minidom.parse(modelPath)
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py
index 682239cf95ee..f810f24c86b4 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -746,6 +746,7 @@ def main():
nsName = filePath.split('OOXMLFactory_')[1].split('.cxx')[0]
createImpl(modelNode, nsName)
+
if __name__ == "__main__":
main()
diff --git a/writerfilter/source/ooxml/qnametostr.py b/writerfilter/source/ooxml/qnametostr.py
index 7b6f8de0f9f3..6e02d2c69f98 100644
--- a/writerfilter/source/ooxml/qnametostr.py
+++ b/writerfilter/source/ooxml/qnametostr.py
@@ -46,6 +46,7 @@ void QNameToString::init()
print(""" mMap[NS_ooxml::LN_%s] = "ooxml:%s";""" % (token, token))
self.tokens.append(token)
+
parser = xml.sax.make_parser()
parser.setContentHandler(ContentHandler())
parser.parse(sys.argv[1])
diff --git a/writerfilter/source/ooxml/resourceids.py b/writerfilter/source/ooxml/resourceids.py
index 087f00c83f86..c66a3367b5e0 100644
--- a/writerfilter/source/ooxml/resourceids.py
+++ b/writerfilter/source/ooxml/resourceids.py
@@ -53,6 +53,7 @@ namespace NS_ooxml
self.tokens.append(token)
self.counter += 1
+
parser = xml.sax.make_parser()
parser.setContentHandler(ContentHandler())
parser.parse(sys.argv[1])
diff --git a/writerfilter/source/ooxml/tox.ini b/writerfilter/source/ooxml/tox.ini
index 7c1de86cadb7..c1781905c427 100644
--- a/writerfilter/source/ooxml/tox.ini
+++ b/writerfilter/source/ooxml/tox.ini
@@ -1,2 +1,2 @@
-[pep8]
+[pycodestyle]
ignore = E501
More information about the Libreoffice-commits
mailing list