Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 2.6 support #34

Merged
merged 1 commit into from
Aug 28, 2014
Merged

Python 2.6 support #34

merged 1 commit into from
Aug 28, 2014

Conversation

dbrgn
Copy link
Collaborator

@dbrgn dbrgn commented Aug 27, 2014

This should add Python 2.6 support, as indirectly requested in #33. Wasn't that hard after all (except for the monkey patching).

@tobiasbrunner could you review this?

@@ -96,5 +96,5 @@ def create_swid_tags(environment, entity_name, regid, full=False, matcher=all_ma
payload_tag = _create_payload_tag(pi)
software_identity.append(payload_tag)

swidtag_flat = ET.tostring(software_identity, encoding='utf-8', method='xml').replace(b'\n', b'')
swidtag_flat = ET.tostring(software_identity, encoding='utf-8').replace(b'\n', b'')
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Argument does't exist in 2.6. xml is the default anyways.

@dbrgn dbrgn mentioned this pull request Aug 27, 2014
@tobiasbrunner
Copy link
Member

Looks OK to me.

@dbrgn dbrgn merged commit 134d1fb into master Aug 28, 2014
@dbrgn dbrgn deleted the py26 branch August 28, 2014 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants