Project

General

Profile

Patch #939

make gen.py Python3 compatible

Added by Alex Turbov almost 8 years ago. Updated over 6 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Robin Mills
Category:
build
Target version:
0.25
Start date:
20 Dec 2013
Due date:
% Done:

100%

Estimated time:

Description

In gentoo, to make documentation we've forced to use Python2 environment just to make documentation.
This patch make `gen.py` compatible w/ Python2 and 3.

Files

exiv2-0.23-python3-ready.patch (937 Bytes) exiv2-0.23-python3-ready.patch Alex Turbov, 20 Dec 2013 17:01
exiv2-0.23-python3-ready.patch (939 Bytes) exiv2-0.23-python3-ready.patch Alex Turbov, 20 Dec 2013 17:03
exiv2-svn-python3-compatible.patch (1.73 KB) exiv2-svn-python3-compatible.patch patch against r3210 Alex Turbov, 20 Dec 2013 18:09
gen.py (1.5 KB) gen.py new dot/templates/gen.py Alex Turbov, 20 Dec 2013 18:12
gen.py (1.51 KB) gen.py new website/bin/gen.py Alex Turbov, 20 Dec 2013 18:13

History

#2

Updated by Alex Turbov almost 8 years ago

better patch is the second one.... (939 Bytes)

#3

Updated by Robin Mills almost 8 years ago

  • Category set to build
  • Status changed from New to Assigned
  • Assignee set to Robin Mills
  • Target version set to 0.25

Thanks. This feels like a painless change for us which will save you pain.

I've tried to apply this with SmartSVN and he says "This isn't a patch" or something very unfriendly. As there is only one file, may I ask you:

1) Attach the new version of gen.py for the head of trunk (r3210)
2) Both files. For doc/templates and website/bin

527 rmills@rmills-mbp:~/gnu/exiv2/trunk $ finder gen.py
./doc/templates/gen.py
./website/bin/gen.py
528 rmills@rmills-mbp:~/gnu/exiv2/trunk $ diff $(find . -name gen.py)
4c4
< vardir = "." 
---
> vardir = "./var" 
529 rmills@rmills-mbp:~/gnu/exiv2/trunk $
(website/bin/gen.py generates our on-line docs. It's almost identical to doc/templates/gen.py)

Ho Ho Ho. Happy Holidays.

Robin

#4

Updated by Alex Turbov almost 8 years ago

here is a patch obtained as a result of `svn di`

#5

Updated by Alex Turbov almost 8 years ago

#6

Updated by Alex Turbov almost 8 years ago

#7

Updated by Robin Mills almost 8 years ago

  • Status changed from Assigned to Resolved

Thanks, Alex. I've submitted your changes. r3211

I've advanced this issue to "Resolved". We only close bug during the review process before we release. If we discover anything more about this between now and 0.25 we'll add notes here.

Thanks for the svn compatible patch. That worked perfectly and diff reported a match with your two versions of gen.py.

547 rmills@rmills-mbp:~/gnu/exiv2/trunk $ diff website/bin/gen.py ~/temp/patch/website/bin/gen.py
548 rmills@rmills-mbp:~/gnu/exiv2/trunk $ diff doc/templates/gen.py ~/temp/patch/doc/templates/gen.py 
549 rmills@rmills-mbp:~/gnu/exiv2/trunk $
If you didnt use svn to create the patch file, perhaps you could explain how it was produced. I will update our wiki and acknowledge your contribution:
http://dev.exiv2.org/projects/exiv2/wiki/How_do_I_request_changes_to_Maker_Notes_for_New_Camera_Models_and_Accessories

Thanks very much for contributing to Exiv2. Together we all make open source work.

Robin

#8

Updated by Alex Turbov almost 8 years ago

the very first patch is a result of ordinal diff utility:

$ diff -ubr exiv2.org/ exiv2.hacked/

to apply, one may use ordinal patch utility:
root-of-exiv2-sources$ patch -p1 < exiv2-0.23-python3-ready.patch

#9

Updated by Robin Mills almost 8 years ago

I've reported this on the SmartSVN Forum. Thanks for the update.

http://www.wandisco.com/svnforum/threads/67146-Support-for-ordinal-diff-patch?p=158811#post158811

Robin

#10

Updated by Robin Mills over 6 years ago

  • % Done changed from 0 to 100
#11

Updated by Andreas Huggel over 6 years ago

  • Status changed from Resolved to Closed

Also available in: Atom PDF