Patchwork [1,of,3] setup: kill pure hack for osutil on Windows for Python 2.4

login
register
mail settings
Submitter Adrian Buehlmann
Date May 14, 2015, 9:11 a.m.
Message ID <528f2c892eed77ed7d75.1431594711@kork>
Download mbox | patch
Permalink /patch/9069/
State Accepted
Headers show

Comments

Adrian Buehlmann - May 14, 2015, 9:11 a.m.
# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1431594271 -7200
# Node ID 528f2c892eed77ed7d750efaa5a6f654d82f6a2b
# Parent  407a0d664643a749071a9f720f79664d81fbcf52
setup: kill pure hack for osutil on Windows for Python 2.4

see e1fb276d4619

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -505,13 +505,9 @@ 
 if sys.platform == 'darwin':
     osutil_ldflags += ['-framework', 'ApplicationServices']
 
-# disable osutil.c under windows + python 2.4 (issue1364)
-if sys.platform == 'win32' and sys.version_info < (2, 5, 0, 'final'):
-    pymodules.append('mercurial.pure.osutil')
-else:
-    extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'],
-                                extra_link_args=osutil_ldflags,
-                                depends=common_depends))
+extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'],
+                            extra_link_args=osutil_ldflags,
+                            depends=common_depends))
 
 try:
     from distutils import cygwinccompiler