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

Make some buildtools py2/3 compatible - #12996

Closed
cowlicks wants to merge 1 commit into
EFForg:masterfrom
cowlicks:py23
Closed

cowlicks wants to merge 1 commit into
EFForg:masterfrom
cowlicks:py23

Conversation

@cowlicks

@cowlicks cowlicks commented Oct 6, 2017

Copy link
Copy Markdown
Contributor

No description provided.

Comment thread utils/make-json.py
# this rule will be added in the list.
json_output["targets"][target].append(len(json_output["rulesetStrings"]))
json_output["rulesetStrings"].append(etree.tostring(tree))
json_output["rulesetStrings"].append(etree.tounicode(tree))

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This file is where behavior changes would be if there are any.

@cowlicks

cowlicks commented Oct 6, 2017

Copy link
Copy Markdown
Contributor Author

It looks like this directly reverts some changes in #7136

Hmm I think the correct path forward is probably to adapt our python scripts to be 2/3 compatible, and update their shebangs as we do so.

The hardest change would be to utils/zipfile_deterministic.py, instead of updating that file it might be better to try to just use a linux utility. We could also just bundle it with create_xpi.py and use that directly as a script, since there are no external dependencies beyond that.

@ghost

ghost commented Oct 6, 2017

Copy link
Copy Markdown

@cowlicks I don't think we need the builds to be deterministic since Tor Project makes their own builds.

@Bisaloo

Bisaloo commented Oct 7, 2017

Copy link
Copy Markdown
Collaborator

Related: #9993

@Hainish

Hainish commented Feb 23, 2018

Copy link
Copy Markdown
Member

Superseded by more recent py3.6 rewrite.

@Hainish Hainish closed this Feb 23, 2018
@Hainish

Hainish commented Feb 23, 2018

Copy link
Copy Markdown
Member

#6749

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants