Skip to content
This repository was archived by the owner on Apr 29, 2023. It is now read-only.

fix: allow multiple --location-prefix-rewrite command-line options #109

Open
maciekwawro wants to merge 1 commit into
base: next
Choose a base branch
from
Open

fix: allow multiple --location-prefix-rewrite command-line options #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pyxb/binding/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,8 +1966,8 @@ def locationPrefixRewriteMap (self):
"""
return self.__locationPrefixRewriteMap
def setLocationPrefixRewriteMap (self, location_prefix_rewrite_map):
self.__locationPrefixMap.clear()
self.__locationPrefixMap.update(location_prefix_rewrite_map)
self.__locationPrefixRewriteMap.clear()
self.__locationPrefixRewriteMap.update(location_prefix_rewrite_map)
return self
def addLocationPrefixRewrite (self, prefix, substituent):
"""Add a rewrite entry for schema locations.
Expand All @@ -1981,7 +1981,7 @@ def addLocationPrefixRewrite (self, prefix, substituent):

self.__locationPrefixRewriteMap[prefix] = substituent
return self
def argAddLocationPrefixRewrite (self, prefix_rewrite):
def argSetLocationPrefixRewriteMap (self, prefix_rewrites):
"""Add a rewrite entry for schema locations.

Parameter values are strings of the form C{pfx=sub}. The
Expand All @@ -1996,11 +1996,10 @@ def argAddLocationPrefixRewrite (self, prefix_rewrite):
"""

try:
(prefix, substituent) = prefix_rewrite.split('=', 1)
rewrite_map = dict(map(lambda rewrite: rewrite.split('=', 1), prefix_rewrites))
except:
raise
self.addLocationPrefixRewrite(prefix, substituent)
__locationPrefixMap = {}
self.setLocationPrefixRewriteMap(rewrite_map)

def schemaLocationList (self):
"""A list of locations from which entrypoint schemas are to be
Expand Down Expand Up @@ -2391,7 +2390,7 @@ def __stripSpaces (self, string):
('binding_root', setBindingRoot),
('schema_root', setSchemaRoot),
('schema_stripped_prefix', setSchemaStrippedPrefix),
('location_prefix_rewrite', argAddLocationPrefixRewrite),
('location_prefix_rewrite', argSetLocationPrefixRewriteMap),
('schema_location', setSchemaLocationList),
('module', _setModuleList),
('module_prefix', setModulePrefix),
Expand Down Expand Up @@ -2461,7 +2460,8 @@ def optionParser (self, reset=False):
group.add_option('--schema-stripped-prefix', metavar="TEXT", type='string',
help=self.__stripSpaces(self.schemaStrippedPrefix.__doc__))
group.add_option('--location-prefix-rewrite', metavar="TEXT", type='string',
help=self.__stripSpaces(self.argAddLocationPrefixRewrite.__doc__))
action='append',
help=self.__stripSpaces(self.argSetLocationPrefixRewriteMap.__doc__))
group.add_option('--uri-content-archive-directory', metavar="DIRECTORY",
help=self.__stripSpaces(self.uriContentArchiveDirectory.__doc__))
parser.add_option_group(group)
Expand Down