Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
fireundubh committed Jun 15, 2021
2 parents 3290a35 + 86b55d5 commit ebe7500
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
8 changes: 2 additions & 6 deletions pyro/PackageManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def _match(root_dir: str, file_pattern: str, *, exclude_pattern: str = '', user_
def _generate_include_paths(includes_node: etree.ElementBase, root_path: str, zip_mode: bool = False) -> typing.Generator:
for include_node in filter(is_include_node, includes_node):
attr_no_recurse: bool = include_node.get(XmlAttributeName.NO_RECURSE) == 'True'
attr_path: str = (include_node.get(XmlAttributeName.PATH) or '').strip()
attr_path: str = include_node.get(XmlAttributeName.PATH).strip()
search_path: str = include_node.text

if not search_path:
Expand Down Expand Up @@ -128,11 +128,7 @@ def _generate_include_paths(includes_node: etree.ElementBase, root_path: str, zi
for match_node in filter(is_match_node, includes_node):
attr_in: str = match_node.get(XmlAttributeName.IN).strip()
attr_no_recurse: bool = match_node.get(XmlAttributeName.NO_RECURSE) == 'True'
attr_exclude: str = (match_node.get(XmlAttributeName.EXCLUDE) or '').strip()

if not attr_in:
PackageManager.log.error(f'"In" attribute of "Match" tag at line {match_node.sourceline} in project file is empty')
sys.exit(1)
attr_exclude: str = match_node.get(XmlAttributeName.EXCLUDE).strip()

in_path: str = os.path.normpath(attr_in)

Expand Down
3 changes: 0 additions & 3 deletions pyro/PapyrusProject.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,6 @@ def _update_attributes(self, parent_node: etree.ElementBase) -> None:
if node.text:
node.text = self.parse(node.text.strip())

if not node.attrib:
continue

tag = node.tag.replace('{%s}' % self.ppj_root.ns, '')

if tag == XmlTagName.PAPYRUS_PROJECT:
Expand Down

0 comments on commit ebe7500

Please sign in to comment.