This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12553

setup: fix the py2exe logic to work with py3
AcceptedPublic

Authored by mharbison72 on Wed, Apr 13, 6:47 PM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Summary

TortoiseHg still uses (the modernized) py2exe packaging, but the build was
failing since py2exe.Distribution was removed.

One thing to note is that later in this module, there's a hack to include
distutils when building from a virtualenv. While import distutils works in
hg debugshell when built with py2, it doesn't work in py3. I'm not sure why-
I don't see it in library.zip either. It doesn't seem to break anything
though.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Wed, Apr 13, 6:47 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptWed, Apr 13, 6:47 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

mharbison72 added a child revision: D12554: resourceutil: force filesystem access to resources when using py2exe.Wed, Apr 13, 6:48 PM

Alphare accepted this revision.Thu, Apr 14, 4:36 AM

This revision is now accepted and ready to land.Thu, Apr 14, 4:36 AM

Shouldn't this series (aside from the last one that is not supposed to be queued) be for stable?

In D12553#192076, @Alphare wrote:

Shouldn't this series (aside from the last one that is not supposed to be queued) be for stable?

D12555 should probably go on stable. But the rest would affect the py2 version of py2exe, and I don't want to break that. There was something in mercurial.thirdparty.concurrent that was py2-only syntax, and caused the py3 version of py2exe to break. So I' can't develop the py3 stuff from stable anyway.

Revision Contents
Changeset List

			Path	Packages
M			setup.py (2 lines)

Commit	Parents	Author	Summary	Date
560db06a8168	5d205e476057	Matt Harbison		Wed, Apr 13, 2:25 PM

Status	Author	Revision
Needs Review	mharbison72	D12557 windows: fix stdio with py2exe and py3
Accepted	mharbison72	D12556 windows: disable pager when packaged with py2exe
Accepted	mharbison72	D12555 procutil: avoid `+= None` when writing to full std{err,out} descriptor on py3
Accepted	mharbison72	D12554 resourceutil: force filesystem access to resources when using py2exe
Accepted	mharbison72	D12553 setup: fix the py2exe logic to work with py3

Diff 33168

setup.py

	code = '#include <%s>\nint main(void) { return 0; }\n' % headername			code = '#include <%s>\nint main(void) { return 0; }\n' % headername
	return cancompile(cc, code)			return cancompile(cc, code)


	# py2exe needs to be installed to work			# py2exe needs to be installed to work
	try:			try:
	import py2exe			import py2exe

	py2exe.Distribution # silence unused import warning			py2exe.patch_distutils()
	py2exeloaded = True			py2exeloaded = True
	# import py2exe's patched Distribution class			# import py2exe's patched Distribution class
	from distutils.core import Distribution			from distutils.core import Distribution
	except ImportError:			except ImportError:
	py2exeloaded = False			py2exeloaded = False


	def runcmd(cmd, env, cwd=None):			def runcmd(cmd, env, cwd=None):

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	33168			Wed, Apr 13, 6:47 PM	★	★