|
 |
902ad9c |
--- pysvn-1.5.2/Source/pysvn/__init__.py~ 2007-01-04 22:27:40.000000000 +0100
|
|
|
902ad9c |
+++ pysvn-1.5.2/Source/pysvn/__init__.py 2008-01-07 12:24:30.000000000 +0100
|
|
|
902ad9c |
@@ -88,23 +88,26 @@
|
|
|
902ad9c |
SVN_DIRENT_ALL = 0xffffffffl
|
|
|
902ad9c |
|
|
|
902ad9c |
try:
|
|
|
902ad9c |
- maj_min = sys.version_info[:2]
|
|
|
902ad9c |
+ # Drop the version trickery below
|
|
|
902ad9c |
+ import _pysvn
|
|
|
902ad9c |
+
|
|
|
902ad9c |
+ #maj_min = sys.version_info[:2]
|
|
|
902ad9c |
|
|
|
902ad9c |
#
|
|
|
902ad9c |
# use an if tree so that its easy for app makers to
|
|
|
902ad9c |
# find the import that is requires
|
|
|
902ad9c |
#
|
|
|
902ad9c |
- if maj_min == (2,3):
|
|
|
902ad9c |
- import _pysvn_2_3
|
|
|
902ad9c |
- _pysvn = _pysvn_2_3
|
|
|
902ad9c |
- elif maj_min == (2,4):
|
|
|
902ad9c |
- import _pysvn_2_4
|
|
|
902ad9c |
- _pysvn = _pysvn_2_4
|
|
|
902ad9c |
- elif maj_min == (2,5):
|
|
|
902ad9c |
- import _pysvn_2_5
|
|
|
902ad9c |
- _pysvn = _pysvn_2_5
|
|
|
902ad9c |
- else:
|
|
|
902ad9c |
- raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
|
|
|
902ad9c |
+ #if maj_min == (2,3):
|
|
|
902ad9c |
+ # import _pysvn_2_3
|
|
|
902ad9c |
+ # _pysvn = _pysvn_2_3
|
|
|
902ad9c |
+ #elif maj_min == (2,4):
|
|
|
902ad9c |
+ # import _pysvn_2_4
|
|
|
902ad9c |
+ # _pysvn = _pysvn_2_4
|
|
|
902ad9c |
+ #elif maj_min == (2,5):
|
|
|
902ad9c |
+ # import _pysvn_2_5
|
|
|
902ad9c |
+ # _pysvn = _pysvn_2_5
|
|
|
902ad9c |
+ #else:
|
|
|
902ad9c |
+ # raise ImportError( 'Fix pysvn/__init__.py to support python %d.%d' % tuple(maj_min) )
|
|
|
902ad9c |
|
|
|
902ad9c |
for key, value in _pysvn.__dict__.items():
|
|
|
902ad9c |
if not key.startswith( '__' ):
|
|
|
902ad9c |
--- pysvn-1.5.2/Source/setup.py.orig 2008-01-11 13:59:59.000000000 -0800
|
|
|
902ad9c |
+++ pysvn-1.5.2/Source/setup.py 2008-01-11 14:02:55.000000000 -0800
|
|
|
902ad9c |
@@ -163,14 +163,17 @@
|
|
|
902ad9c |
# name of the module including the python version to help
|
|
|
902ad9c |
# ensure that only a matching _pysvn.so for the version of
|
|
|
902ad9c |
# python is imported
|
|
|
902ad9c |
- py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
|
|
|
902ad9c |
- py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
|
|
|
902ad9c |
+ # Drop this python version trickery
|
|
|
902ad9c |
+ #py_cflags_list.append( '-Dinit_pysvn=init_pysvn_%d_%d' % sys.version_info[:2] )
|
|
|
902ad9c |
+ #py_cflags_list.append( '-Dinit_pysvn_d=init_pysvn_%d_%d_d' % sys.version_info[:2] )
|
|
|
902ad9c |
|
|
|
902ad9c |
module_type = '.so'
|
|
|
902ad9c |
if sys.platform == 'cygwin':
|
|
|
902ad9c |
module_type = '.dll'
|
|
|
902ad9c |
template_values = {
|
|
|
902ad9c |
- 'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
|
|
|
902ad9c |
+ # More version "trickery"
|
|
|
902ad9c |
+ #'pysvn_module_name': '_pysvn_%d_%d%s' % (sys.version_info[0], sys.version_info[1], module_type),
|
|
|
902ad9c |
+ 'pysvn_module_name': '_pysvn%s' % (module_type),
|
|
|
902ad9c |
|
|
|
902ad9c |
# python executable
|
|
|
902ad9c |
'python_exe': sys.executable,
|