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.

Sign up for GitHub

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

Jump to bottom

remove Python2 hybridation code #2540

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

remove Python2 hybridation code #2540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82750e0
remove usage of six.print_()
a-detiste Mar 20, 2024
73a7522
remove most of Python2 compatibility code
a-detiste Mar 21, 2024
62fa5d8
remove more Python2 hybridation
a-detiste Mar 21, 2024
2282037
finish removing six
a-detiste Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
# License: wxWindows License
#----------------------------------------------------------------------

from __future__ import absolute_import

import sys
import glob
import hashlib
Expand Down Expand Up @@ -52,10 +50,6 @@
import buildtools.version as version


# which version of Python is running this script
PY2 = sys.version_info[0] == 2
PY3 = sys.version_info[0] == 3


# defaults
PYVER = '2.7'
Expand Down Expand Up @@ -1072,7 +1066,7 @@ def _removeSidebar(path):
tag = soup.find('div', 'document')
if tag:
tag.attrs['class'] = ['document-no-sidebar']
text = unicode(soup) if PY2 else str(soup)
text = str(soup)
with textfile_open(filename, 'wt') as f:
f.write(text)

Expand Down Expand Up @@ -1486,9 +1480,6 @@ def cmd_build_wx(options, args):
if options.jom:
build_options.append('--jom')

if PY2:
build_options.append('--no_dpi_aware')

else:
# Platform is something other than MSW
if options.osx_carbon:
Expand Down