From b3f3e3548a0f508e7fe02ab1a48ac177ba08101a Mon Sep 17 00:00:00 2001
From: Dave Kuhlman <dkuhlman@davekuhlman.org>
Date: Wed, 5 Aug 2015 13:09:44 -0700
Subject: [PATCH] Change default export; install process_includes.py as
library.
---
README | 7 +++++++
generateDS.py | 6 +++---
setup.py | 3 +++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/README b/README
index a3a143f..d083234 100644
--- a/README
+++ b/README
@@ -141,6 +141,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.17a (05/28/2015)
+- Modified setup.py so that process_includes.py is installed where
+ it can be imported.
+- Changed default settings for export -- Default is now to generate
+ only the normal export methods, instead of both normal and
+ literal. See command line option --export.
+
Version 2.16a (05/28/2015)
- Added new command line option ("--preserve-cdata-tags") that
causes generation of code that contains a special parser to retain
diff --git a/generateDS.py b/generateDS.py
index 9b6d31a..40fe6d0 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -247,7 +247,7 @@ CurrentNamespacePrefix = 'xs:'
AnyTypeIdentifier = '__ANY__'
ExportWrite = True
ExportEtree = False
-ExportLiteral = True
+ExportLiteral = False
FixTypeNames = None
SingleFileOutput = True
OutputDirectory = None
@@ -2755,9 +2755,9 @@ def generateExportFn(wrt, prefix, element, namespace, nameSpacesDef):
name, quote_attrib(value), ))
else:
unique_counter += 1
- outfile.write(' xmlns:yyy%d=\"%s\"' % (
+ outfile.write(' xmlns:%d=\"%s\"' % (
unique_counter, namespace, ))
- outfile.write(' yyy%d:%s=%s' % (
+ outfile.write(' %d:%s=%s' % (
unique_counter, name, quote_attrib(value), ))
else:
if name not in already_processed:
diff --git a/setup.py b/setup.py
index 8b17964..b982052 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,9 @@ XML document.""",
## "gui.generateds_gui",
## "gui.generateds_gui_session",
## ],
+ py_modules=[
+ "process_includes",
+ ],
# include_package_data=True,
packages = [
"libgenerateDS",
--
GitLab