Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
7bb5e477
Commit
7bb5e477
authored
Dec 05, 2019
by
Bryton Lacquement
🚪
Committed by
Julien Muchembled
Feb 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pysvn: make the patch compatible with Python 3
pysvn 1.7.10 already supports Python 3, but this patch did not.
parent
a9df4e0c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
component/pysvn-python/buildout.cfg
component/pysvn-python/buildout.cfg
+1
-1
component/pysvn-python/pysvn-1.7.10-inc_lib_dir.patch
component/pysvn-python/pysvn-1.7.10-inc_lib_dir.patch
+5
-2
No files found.
component/pysvn-python/buildout.cfg
View file @
7bb5e477
...
...
@@ -13,7 +13,7 @@ egg =
pysvn
find-links = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.10.tar.gz
patches =
${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#0
2d00b58d537242aa5bb5c9202dedbf1
${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#0
8371129e0d0a215fb7f7811a860a89c
${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
patch-options = -p1
patch-binary = ${patch:location}/bin/patch
...
...
component/pysvn-python/pysvn-1.7.10-inc_lib_dir.patch
View file @
7bb5e477
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/setup.py 2015-08-14 10:29:25.562686564 +0200
@@ -19,6 +19,
7
@@
@@ -19,6 +19,
10
@@
import os
import os.path
import setuptools.command.bdist_egg
+from ConfigParser import ConfigParser
+try:
+ from ConfigParser import ConfigParser
+except ImportError:
+ from configparser import ConfigParser
pysvn_version_info = {}
f = open( 'Builder/version.info', 'r' )
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment