Unifield Web

Merge lp:~jr.allen/unifield-web/us-2374-fix into lp:unifield-web

  1. us-2374-fix
  2. Merge into trunk
Proposed by Jeff Allen
Status: Merged
Merged at revision: 4837
Proposed branch: lp:~jr.allen/unifield-web/us-2374-fix
Merge into: lp:unifield-web
Diff against target: 14 lines (+1/-2)
1 file modified
setup_py2exe_custom.py (+1/-2)
To merge this branch: bzr merge lp:~jr.allen/unifield-web/us-2374-fix
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+317818@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup_py2exe_custom.py'
2--- setup_py2exe_custom.py 2017-02-07 10:55:50 +0000
3+++ setup_py2exe_custom.py 2017-02-21 09:34:49 +0000
4@@ -24,9 +24,8 @@
5
6 import os
7 import tempfile
8-import sys
9
10-if sys.platform == 'nt':
11+if os.name == 'nt':
12 from py2exe.build_exe import py2exe as build_exe, fancy_split
13 else:
14 # fake it for non-Windows, so that setup.py can be run for

Subscribers

People subscribed via source and target branches

to all changes: