##// END OF EJS Templates
setup: inline os.fsdecode now that we're done with Python 2...
Augie Fackler -
r49684:fef4198c default
parent child Browse files
Show More
@@ -741,12 +741,9 b' class buildhgexe(build_ext):'
741
741
742 # Copy the pythonXY.dll next to the binary so that it runs
742 # Copy the pythonXY.dll next to the binary so that it runs
743 # without tampering with PATH.
743 # without tampering with PATH.
744 fsdecode = lambda x: x
745 if sys.version_info[0] >= 3:
746 fsdecode = os.fsdecode
747 dest = os.path.join(
744 dest = os.path.join(
748 os.path.dirname(self.hgtarget),
745 os.path.dirname(self.hgtarget),
749 fsdecode(dllbasename),
746 os.fsdecode(dllbasename),
750 )
747 )
751
748
752 if not os.path.exists(dest):
749 if not os.path.exists(dest):
@@ -756,7 +753,7 b' class buildhgexe(build_ext):'
756 # TODO: also handle the MSYS flavor
753 # TODO: also handle the MSYS flavor
757 if sys.version_info[0] >= 3:
754 if sys.version_info[0] >= 3:
758 python_x = os.path.join(
755 python_x = os.path.join(
759 os.path.dirname(fsdecode(buf.value)),
756 os.path.dirname(os.fsdecode(buf.value)),
760 "python3.dll",
757 "python3.dll",
761 )
758 )
762
759
General Comments 0
You need to be logged in to leave comments. Login now