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