Commit 7bb5e477 authored by Bryton Lacquement's avatar Bryton Lacquement 🚪 Committed by Julien Muchembled

pysvn: make the patch compatible with Python 3

pysvn 1.7.10 already supports Python 3, but this patch did not.
parent a9df4e0c
...@@ -13,7 +13,7 @@ egg = ...@@ -13,7 +13,7 @@ egg =
pysvn pysvn
find-links = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.10.tar.gz find-links = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.10.tar.gz
patches = patches =
${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#02d00b58d537242aa5bb5c9202dedbf1 ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#08371129e0d0a215fb7f7811a860a89c
${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b ${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
patch-options = -p1 patch-options = -p1
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
......
diff -ur pysvn-1.7.10.orig/setup.py pysvn-1.7.10/setup.py diff -ur pysvn-1.7.10.orig/setup.py pysvn-1.7.10/setup.py
--- pysvn-1.7.10.orig/setup.py 2010-12-30 13:26:51.000000000 +0100 --- pysvn-1.7.10.orig/setup.py 2010-12-30 13:26:51.000000000 +0100
+++ pysvn-1.7.10/setup.py 2015-08-14 10:29:25.562686564 +0200 +++ pysvn-1.7.10/setup.py 2015-08-14 10:29:25.562686564 +0200
@@ -19,6 +19,7 @@ @@ -19,6 +19,10 @@
import os import os
import os.path import os.path
import setuptools.command.bdist_egg import setuptools.command.bdist_egg
+from ConfigParser import ConfigParser +try:
+ from ConfigParser import ConfigParser
+except ImportError:
+ from configparser import ConfigParser
pysvn_version_info = {} pysvn_version_info = {}
f = open( 'Builder/version.info', 'r' ) f = open( 'Builder/version.info', 'r' )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment