pax_global_header00006660000000000000000000000064136344305050014515gustar00rootroot0000000000000052 comment=2354804ae97b4867fe7f84e1814017b5ad4c05c3 python-patch-ng-1.17.4/000077500000000000000000000000001363443050500146275ustar00rootroot00000000000000python-patch-ng-1.17.4/.github/000077500000000000000000000000001363443050500161675ustar00rootroot00000000000000python-patch-ng-1.17.4/.github/workflows/000077500000000000000000000000001363443050500202245ustar00rootroot00000000000000python-patch-ng-1.17.4/.github/workflows/workflow.yml000066400000000000000000000006551363443050500226270ustar00rootroot00000000000000name: Main workflow on: [push] jobs: build: runs-on: ubuntu-16.04 strategy: matrix: python: [ '2.x', '3.x', 'pypy3' ] name: Python ${{ matrix.python }} Testing steps: - uses: actions/checkout@master - name: Setup python uses: actions/setup-python@v1 with: python-version: ${{ matrix.python }} architecture: x64 - run: python tests/run_tests.pypython-patch-ng-1.17.4/.gitignore000066400000000000000000000000511363443050500166130ustar00rootroot00000000000000*.pyc build dist .idea patch_ng.egg-info python-patch-ng-1.17.4/.travis.yml000066400000000000000000000032011363443050500167340ustar00rootroot00000000000000stages: - test - name: deploy if: tag IS present language: python install: - pip install coverage script: # run tests and report coverage - coverage run tests/run_tests.py - coverage report -m --omit=tests/run_tests.py jobs: include: - stage: test python: 2.7 - python: 3.4 - python: 3.5 - python: 3.6 - python: 3.7 - python: 3.8 - stage: deploy install: script: - "PACKAGE_VERSION=$(cat patch_ng.py | grep __version__ | head -1 | awk -F= '{ print $2 }' | sed 's/[ \",]//g')" - echo "Deploying library version '$PACKAGE_VERSION'" - echo "Tagged in repo as '$TRAVIS_TAG'" - | if [ "$PACKAGE_VERSION" != "$TRAVIS_TAG" ]; then echo "Library version and tag name mismatch!" travis_terminate 1 fi deploy: provider: pypi user: "__token__" password: secure: "xQjEWfYtAHiFDMVxn7WeodCX3OiboVrJnaLQTk9EiZEHXmLViA0BknyuNR5MVYwv+mIeWKU70scPgzhMw7Dn6A6o/NVFdJIXmUkxttWMTLia0uPyhfFDSefFH2dRECU2vo4fIgWxBzDKGsNYtHDHjvsIRTl9PsWwBKYaKNl+w6einTUNwTyQvMdpQjQ/VV3dQnMQqc86LkDXpAhNVHFe+cbA+phk8WGrsamlyd+vEJ7xgNSotNp0405IPbXLSxC7wo5qAfKgeIjXwHN6OV1IcbKiUGD9iw0QUKme3Gqmr4kNC+9eQQ+SrOv1Crpmsa8/q7F3ECvJ/NVAzzJ7/ZiMdkhfumzn8J9tvOdjQ6lx78it0xToL2h5tmN3gClyawrA/0VUzLDih7UjFTkolGVXAoZzqiBJdb5NLS06JlGp01c9cxotqeAdylHRptx5ovrYZsf7GHjXYvxg/ry9SjyQN0hb3l62WQCilqf4DX2iEgDHQX6ushvpHmNQseQCti4gvsMj8CQkhhK2PASB6cHsQ1GZXFdQ0QtQ1nw6mI461iiF0xDNfRQuRFSf8tmnhdgqC9s7yfI+vD1uN3mVnIP0j+B6G0DTvjOcI+vasWcbQSrwRdBFl9e/Gjlu26jEaxmPWDCH/FvLmDFRlVSOibGBL4MZPvUJGMMNlMm+N2pBta0=" on: tags: true python-patch-ng-1.17.4/LICENSE000066400000000000000000000042061363443050500156360ustar00rootroot00000000000000MIT License ----------- Copyright (c) 2008-2016 anatoly techtonik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ---- The MIT License (MIT) Copyright (c) 2019 JFrog LTD Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. python-patch-ng-1.17.4/README.md000066400000000000000000000046011363443050500161070ustar00rootroot00000000000000[![Build Status Travis CI](https://travis-ci.org/conan-io/python-patch-ng.svg?branch=master)](https://travis-ci.org/conan-io/python-patch-ng) [![Build status Appveyor](https://ci.appveyor.com/api/projects/status/i4r6lf62slvx82db?svg=true)](https://ci.appveyor.com/project/ConanCIintegration/python-patch-ng) [![PyPI](https://img.shields.io/pypi/v/patch-ng)](https://pypi.python.org/pypi/patch-ng) ## Patch NG (New Generation) #### Library to parse and apply unified diffs. #### Why did we fork this project? This project is a fork from the original [python-patch](https://github.com/techtonik/python-patch) project. As any other project, bugs are common during the development process, the combination of issues + pull requests are able to keep the constant improvement of a project. However, both community and author need to be aligned. When users, developers, the community, needs a fix which are important for their projects, but there is no answer from the author, or the time for response is not enough, then the most plausible way is forking and continuing a parallel development. That's way we forked the original and accepted most of PRs waiting for review since jun/2019 (5 months from now). ### Features * Python 2 and 3 compatible * Automatic correction of * Linefeeds according to patched file * Diffs broken by stripping trailing whitespace * a/ and b/ prefixes * Single file, which is a command line tool and a library * No dependencies outside Python stdlib * Patch format detection (SVN, HG, GIT) * Nice diffstat histogram * Linux / Windows / OS X * Test coverage Things that don't work out of the box: * File renaming, creation and removal * Directory tree operations * Version control specific properties * Non-unified diff formats ### Usage Download **patch_ng.py** and run it with Python. It is a self-contained module without external dependencies. patch_ng.py diff.patch You can also run the .zip file. python patch-ng-1.17.zip diff.patch ### Installation **patch_ng.py** is self sufficient. You can copy it into your repository and use it from here. This setup will always be repeatable. But if you need to add `patch` module as a dependency, make sure to use strict specifiers to avoid hitting an API break when version 2 is released: pip install "patch-ng" ### Other stuff * [CHANGES](doc/CHANGES.md) * [LICENSE: MIT](LICENSE) * [CREDITS](doc/CREDITS) python-patch-ng-1.17.4/appveyor.yml000066400000000000000000000012751363443050500172240ustar00rootroot00000000000000build: false environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PYTHON: "C:\\Python27" PYTHON_ARCH: "32" PYTHON_VERSION: "2.7.x" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PYTHON: "C:\\Python27-x64" PYTHON_ARCH: "64" PYTHON_VERSION: "2.7.x" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PYTHON: "C:\\Python38" PYTHON_ARCH: "32" PYTHON_VERSION: "3.8.x" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PYTHON: "C:\\Python38-x64" PYTHON_ARCH: "64" PYTHON_VERSION: "3.8.x" test_script: - python tests/run_tests.pypython-patch-ng-1.17.4/doc/000077500000000000000000000000001363443050500153745ustar00rootroot00000000000000python-patch-ng-1.17.4/doc/ADOPTIONS.md000066400000000000000000000027161363443050500172640ustar00rootroot00000000000000| Project | Description | patch.py version | Reviewed | |:--------|:------------|:-----------------|:---------| | [conda-recipes](https://github.com/conda/conda-recipes/tree/master/python-patch)| conda package | [1.12.11](https://github.com/conda/conda-recipes/blob/master/python-patch/patch.py) | 2016-01-17 | | [collective.recipe.patch](https://pypi.python.org/pypi/collective.recipe.patch/0.2.2) | buildout recipe for patching eggs | [8.06-1+](https://github.com/garbas/collective.recipe.patch/blob/master/collective/recipe/patch/patch.py) | 2014-01-17 | | [Linux Kernel Backports](https://backports.wiki.kernel.org/index.php/Documentation) | backporting Linux upstream device drivers for usage on older kernels | [1.12.12dev+](https://git.kernel.org/cgit/linux/kernel/git/backports/backports.git/tree/lib/patch.py) | 2014-01-17 | | [LuaPatch](http://lua-users.org/wiki/LuaPatch) | rewrite of patch.py for Lua by David Manura | 8.06-1| 2014-01-17 | | [OpenHatch](https://openhatch.org/) | help wannabe open source developers find interesting projects | [10.04-2+](https://github.com/openhatch/oh-mainline/blob/master/vendor/packages/python-patch/patch.py) | 2014-01-17 | | [nose](https://nose.readthedocs.org/en/latest/) | `nose` extends unittest to make testing easier | [10.04-2+](https://github.com/nose-devs/nose/blob/master/patch.py) | 2014-01-17 | | [pypatch](https://pypi.python.org/pypi/pypatch/0.5.1) | automatically patch installed python modules | 1.12.11 | 2014-01-17 | python-patch-ng-1.17.4/doc/CHANGES.md000066400000000000000000000111471363443050500167720ustar00rootroot00000000000000##### 1.16 - Python 3 support, thanks to Yen Chi Hsuan (@yan12125) (pull request #36) ##### 1.15 - Project moved to GitHub - patch-1.15.zip archive is now executable - improved Git patch detection thanks to @mspncp (#32) - tests/data contains database of all possible patches - tests suite scan now processes tests/data automatically - API changes: + setdebug() initializes logging and enables debug info ##### 1.14.2 - --revert option to apply patches in reverse order (unpatch) - support for broken patches generated by online Google Code editor - API changes: + PatchSet and Patch objects are now iterable + new PatchSet.findfile() contains logic detecting filename to patch + PatchSet.revert() - make directory based tests easier to create and run manually - fix xnormpath with Windows paths on Linux (issue #24, found by Philippe Ombredanne) ##### 1.13 - diffstat output now also shows size delta in bytes - added --directory (-d) option to specify root when applying patches - hunk headers produced by `diff -p` option are now parsed and accessible (issue #22, found by Philippe Ombredanne) - API changes: + Hunk.desc field to access hunk headers content + PatchSet.apply() gets `root` keyword argument for the working dir when applying patches (issue #7) - improve error message for missing files - improve docs (fix issue #5) ##### 1.12.11 Major API Break - patch.py can read patches from stdin - patch.py can show nice histogram with --diffstat option - added detection of SVN, GIT and HG patch types, unrecognized patches marked as PLAIN - added error reporting for parsing functions and helpers (now they return False if parsing failed) - make sure you handle this correctly - added normalization to filenames to protect against patching files using absolute paths or files in parent directories - test run patch.py on all patches submitted to Python bug tracker, which resulted in improved parsing and error handling for some corner cases - improved logging - API changes * fromfile(), fromstring() and fromurl() now return False on errors * previous Patch is renamed to PatchSet, new Patch is single file entry * Patch.header is now a list of strings * PatchSet.parse() now returns True if parsing completed without errors + PatchSet.__len__() + PatchSet.diffstat() + PatchSet.type and Patch.type + PatchSet.errors and + xisabs() cross-platform version of `os.path.isabs()` + xnormpath() forward slashed version of `os.path.normpath()` + xstrip() to strip absolute path prefixes ##### 11.01 - patch.py can read patches from web - patch.py returns -1 if there were errors during patching - store patch headers (necessary for future DIFF/SVN/HG/GIT detection) - report about extra bytes at the end after patch is parsed - API changes + fromurl() * Patch.apply() now returns True on success ##### 10.11 - fixed fromstring() failure due to invalid StringIO import (issue #9) (thanks john.stumpo for reporting) - added --verbose and --quiet options - improved message logging - change "successfully patched..." message to INFO instead of WARN (thanks Alex Stewart for reporting and patch) - skip __main__ imports when used as a library (patch by Alex Stewart) - API changes * renamed class HunkInfo to Hunk + Patch.type placeholder (no detection yet - parser is not ready) + constants for patch types DIFF/PLAIN, HG/MERCURIAL, SVN/SUBVERSION + Patch.header for saving headers which can be used later to extract additional meta information such as commit message - internal: improving parser speed by allowing blocks fetch lines on demand - test suite improvements ##### 10.04 - renamed debug option to --debug - API changes * method names are now underscored for consistency with difflib + addded Patch.can_patch(filename) to test if source file is in list of source filenames and can be patched * use designated logger "python_patch" instead of default ##### 9.08-2 - compatibility fix for Python 2.4 ##### 9.08-1 - fixed issue #2 - remove trailing whitespaces from filename (thanks James from Twisted Fish) - API changes + added Patch and HunkInfo classes * moved utility methods into Patch + build Patch object by specifying stream to constructor or use top level functions fromfile() and fromstring() - added test suite ##### 8.06-2 - compatibility fix for Python 2.4 ##### 8.06-1 - initial release python-patch-ng-1.17.4/doc/CREDITS000066400000000000000000000003071363443050500164140ustar00rootroot00000000000000I'd like to thank the following people who contributed to development of this library: Alex Stewart Wladimir J. van der Laan (laanwj) azasypkin Philippe Ombredanne mspncp Yen Chi Hsuan (@yan12125) python-patch-ng-1.17.4/doc/HISTORY000066400000000000000000000013641363443050500164640ustar00rootroot00000000000000In 2008 there was no reliable Windows tool to apply patches, and there was no cross-platform solution that could be safely run by web server process. (UNIX *patch* utility)[http://www.gnu.org/software/patch/] was (ported to windows)[http://gnuwin32.sourceforge.net/packages/patch.htm], but there were (a couple of bugs) [http://www.google.com/search?q=Assertion+failed%3A+hunk%2C+file+patch.c] that proved that it can not be run securely in web server process. The utility was also hard to tweak without a C compiler, it messed badly with LF and CRLF line end differences, and so this project was born. *patch.py* was meant to be a cross-platoform tool with intuitive defaults, taking care of the most problems (e.g. line end differences) automatically. python-patch-ng-1.17.4/doc/RELEASING000066400000000000000000000006431363443050500166330ustar00rootroot00000000000000* [ ] Pack .zip archive pip install pypack python -m pypack patch.py * [ ] Write changelog * [ ] Upload archive to PyPI (manually for now) * [ ] Create new version https://pypi.python.org/pypi?%3Aaction=submit_form&name=patch * [ ] Upload .zip for this version * [ ] Update PyPI description * [ ] Download PKG-INFO * [ ] Edit and upload * [ ] Tag release git tag -a git push --follow-tags python-patch-ng-1.17.4/doc/evolution-notes.txt000066400000000000000000000011641363443050500213110ustar00rootroot00000000000000patchset evolution (diff era) 1. change some content in a stream 1. change some lines in a file 1. protect change with context 1. change several files (git diff era) 2. create file 2. rename file 2. move file 2. copy file 2. copy and rename 2. move and rename 2. remove file 3. know file attributes 3. know file mime-type 3. know file binary/text 3. change file attributes (2D patch jump) 4. create directory 4. rename directory 4. move directory 4. copy directory 4. copy and rename 4. move and rename 5. know directory contents 5. record directory tree in 1D structure 5. record changes for 2D structure in 1D structure python-patch-ng-1.17.4/doc/unified_diff_svn.png000066400000000000000000002773711363443050500214240ustar00rootroot00000000000000PNG  IHDRljn pHYs B(xtIME C~IDATx />(};$Nt}A@;N̝{mK3~==˿aP@VqWt͸2nl&FhgW?}w{Cu0TH$@zG?;7/*؟?QA_% Ɲg Oj=n^>O]ΞRdm>W!IGt,<|`];wBZ>;V3#q?x%߿D9nK|5@_R?5_~Wwu;[+M#n݂>?ָ?vt~7ˊ.Ij",ϲN)c/F/_%9QG~'{7a?[L9v,{<&1?'ﾯmf;o~2ul_~ 3/E\vؑǿ\jA)y#t?c lXz?mg;~c-:Yx}gBwrv᭎Yޮ+cG }>z7ۘ~?'XqugFEy#*7^LyUv}̺3'`ז76>o47?M2?Е3xXZyLk_hτk>7?;}v[D>ɮb+k/(S϶wsu>߳$ o?ֶo&}ΒExb!> OwGp;}o竝sm}%s|]ЍǞч-Hב}+`1+/O>fM2M>3u܂K@=c??O ~e滷' s9D/'7 ٱܗRg/wmPTI n?_cVŋE+50}ݾ7n/2ѬͿ2d1ǚwoI7t; {믟omۏ/X1et.2w_|2;Vs$` q ?ԢȯtQ9w]p'X6k|U嫒lQ``ȿHc$V/}%v;5D;U4?i_r-;=QhŽ~gkxϛo&0>g;O\ޔ?廎?17:w0_& yyc3zI3y}} oַ.cI.{S6- y@zd_oZmD$@r=F^V3,gG绉G$?<ܾ\{Es3a;Sknpn g/tH+:E#D7o@`L}bDl<^_& _%>X77-6؟1klzMt7B/[p=W٤mލss~Mt{F~ʂ&?iyͿS&̹]1>R,pСKfFS̼e " $-7OAϿ%[x3n'.ߟ;q@/ @YS}Y&^4,O_f t }%_@_&@/YK-˃./G)\ڜ5ycWnmd_:er_=2Vz'r!X[70c|nV,*&1p?z:Ʊg8ٛwtb$ù&K*8Ii v+Gm؟ ts Gtnx*|Jt{@ů;MWNX΂F g#|ݪkaO73lgW{l:|sn_|Dp)̙Q $I9s</(/io蟖,y˄|(َ"NOJ{c@9 ZEHO5?ۇZTcos K%^q&OƒU%G0td_0Q歙_ƋwON\PޖF"~gidW275QɢЩg_\~Mf7/Ϲd nп_;g^%I7*@AOiӿ{wݏ?\.]fmJw%~?O=Q@:}Iı@Wd|{Wz޾`F>gΒ# ~-D.cY?G\Їk;R̄=̜;}5W{gA$l@?O~-xAlfa_K UYn"UHAb q~H/o<˜k#r  YH(1=>` rn5M@o獭(Focb m>=q#FV!nO9 zm@%!I^{M&2uzw#KǦq?q, 7¹e ӵk23b3g?7W'½!ЉzВo <,K3pFc@hf1m#NL$Y 7q>:ot8sO]7/p In~ τn{ .NϼzrشmA$NzS!Ӻ3K#|+M kf@z|i 2OЭ  wnO kcߜ//.j:]0X?jA2fcnӘ[M*>UĹdBM]X~V "cu ﯺ~}Y2$=|<6 r>O;旎W}~وU-idLo־Wowq*1<{?$L5_{zJ( ľ\Z By$ۇW _;)Ifi•]Ї\l,~ g]t\\)?/יu=ic5C2>1>s-nb3DN'$s3Wt{}Ӓp$@+``{xL]+ڃo-+/J~i&wsQ}g7\ п&AԗÇ$ˏH]?2J I8ovAdRƗZ?G'd~ͷ'/v{t|O_k]}_h?63&y-blEy#6w~s6fowy7 0?ž_yFL3fIfOgϲouk@0sOt1'*JZ:4;}wC@1QI^(&1}>9@BMK&¼}d%!>?h[o\y(.w}ww k E5qOç=#@ݫohM 9 ;& &D0$IC}2}}Yq4'}ivǿWǖ}CMM ~<[@MG/wDo2KHJ>1T ^Ԭ`o\Pww{w}m#fs[^z( 5{o/sj|}ث/e"ϳ}LMuǾC5g̲3 S0B~$w|>ɥpq6~ўE`۸{?*sϵ;?c ?cw_PY7$x!p}ڊ`D.,{?wgV͞_`o.>i¯'y~>tB[XnH(Mz9c>]Sy2~֯ I]$I:,ҍsZ>$$I4 Oց|?tklwNcI$Iz0G MI׻H$@$I!\ңVHW$@$Iw,ι$yM\\xI$Irҕ[>fIt.I$I$I$ %I$I$I.I$I$I]$I$I$I$I$ %I$I$I.I$I$I]$I$I$I$I$ %I$I$I.I$I$I]$I$I$I$I$4@{N)h};^cu.7.NM>I>|NoE:t7uH/Oox[tu)v#;}lV.ItI~[8ߔzuq@X^֫z ʩv0!u.6udO[UU_r5ݵ讷~"0 NA[M ^VEU(K]NeGӮCQ#t7ðv_׎8w8.7݀quVo|}iIǾv/;87C87LۆsU)@Qt `_@3߭o\wru}}vc`UtߕPN\`mYc/pzvmpz}h9!3 Py;{qxݻ`4BH Ὁq^lDZ¾U_ۻ=+q>Xyz_O`i]ĺ t@,ES#JG@j5 _W=Ur_7vu_ ZFa^e:ͥYsA cʋMs#|S@gݰ em?.@:%!@EpY{gY~۶Zݻ4QO-(7=.<in2]i?cXw }{sFqi]I.wrzஂπ/>99ǤY\tocO J3.Ե^tI pA[P@)3}]| a_6BnW޲Mp's4oZ6KeP~ k6/1ܟe;/@1Y빤8> ]dk|Fin"@g R.bBiMXC-O:oݗPݗϓtOB ܖNVX" %DE$@ ش>:PR@>Vj]_t؇Vr}hqN7f<$@]WA[E+Lge#l;y[sDy ەїCW_GOz\kXTڜd>s֣^3+j#@R_[|G|e) )$Dz.N?e/13u׆:,:mk%*$EqyMDk7UZp̝YxM&)_4Jʵ1W74 d!!]n]>aX·,H]Y sO?ݒ =..@tI>1I gDd Ye[-PNو. ЋP&>!zw^[o-R#"!4A.hErmQ\\% eܷ,6Yd}+f]+32ym}Dցgf昬P7 #36x A^YqdBNfZy@C9!-8"4#' .꣼qdK;_l)ffL߽Mp,3<:L2" K]_Ael #8[#ewE *Br{heVe{ϓo,t]'/:ƾ~OO?(U-h}O/^:N:yӋItI$I$I$I$I$@$I$I$I.I$I$ItI$I$I$I$I$@$I$I$I.I$I$ItI$I$I$I$I$ %I$I$I.I$I$I]$I$I$I$I$=@{N)I$IHzA$@l6ono$I$IVI@M$I$In$tI$I$@$I$IKt$I$ItIa^u]mХ墌_sMuz.k٭vO$IKGtBRn'P@݋FT-g~f8=eY^c9b@1}vU̗6.$I]^@'@݅sVl`="z)6_^Ⱥ:e>i~cVo?z3?} 'ڴcuL>u 1P7I=>c{+ I> Pn7A$I$_ $4:@Oz`H$I_Zsww/ұy-};@$I$=_qf'@}}Dz"@"PVe;ܨbsXo֗=8֫osѱ}}Q`]?o6O[/| >mn}N& 砮>EfZJm"XaQ?foV806P=FW?&p~|6{owp>H؟>E=W=Pm8ub_َ`Ñǀ1\Sc}^Z#5vMp -$cPϮX7|meqV1k1biY9@qȏ(k)ڍi?އVi]c}X]}||cQmIaMt\ ګ oU&*$ %#zL*BqmhYp" v?>q}͛,Y[HӻEp< ѠUG(he ݅z+moV[?!\ Q  ܸu;纇ZG",q3j`̂3nɘAu8c})֏߅V֏,8Cc~WsG'woʼn?`}_3'(g8~ $vhJ:fd2F1zI+Vؿrgf%IK' S?NtڶWA rm㍲n зnk5 ~;҃Svb;Q@ϹW}Ԫk-zB6HVXa"@=pHt"@Ol 6n>6a:l}{ 6P3Ji%_;qm)}:RWt556%&97_'`ݗ'${g;E8B?k7þKuq^W{~k SxД0vs bjùNWC虶=@DU Mghm\|UF ~o1[+L:fzt)VcsBc-,+Zw8f,7É-ݸt؇5ǿ]6ɘMҵk|2A!BݍD~ ~L7ht-]fB,+y_qzWHLq\n㢺U?LBw7T_w:|Ęr_ݿh~YAM(z@laLg3;U|1,]8ږp;nV+\?ǬyRxgIap7ޘ[>+7O#쪣M&鵕Y=so՟k5*m䡈k"S6{6 $Ig7@iFzck+ lߴ"L(|oUaؾ*|t7\O]m\ݪ~}6;0?{׎e3lj s..gl!- 7 㶽Ey8[zI.^ˣ2Kn 3'ŋ}M,I\[?t.t5]m#n7|{70(=0CPeFMYd56L\ =d{o\D&}ʶoo/$QQ]xcUC"=1;.~Հ~\{nߤ|%I_2oS>y &Fk. q}L3pcaScA`*ci.~תex7PbG1_7LL$I$ KV{? \#oe[|\2Bz_7J]e~{6kn{tUdD!{cJ 'BJ}7/;=4kT`Mw+3xs caƮy.O͇CD8|_y[@I\ + \wD˲50-z("ufX09]ur~[;~suUamc_\Oͅ7jb]?bw6PMd8}JDf ]?c(2Ǭ>Y@gya[1_mqmqO.3Xl'36SP . 37fS^-HFh>-F]%:~W.'_Nkݍc2.^5ـ%IKg cSkjݸ`0X%AQ70kb2U_UH_;UIT>f72Cqa`K3hie4V`}:0g'\8jroSc?TxVK,9=(#HΏcDEL>tbٲ>. ű(,$njqcu.#?:{#_YeY> 2<#(G@5q\D՜d2E{õƲJ(P}?>yׁ(lߖ/8r$ %3AXim|FEZ ibL10L9\c$9Dwgdf0ozI4ϖxL>'?akZuoqee\& 2I[qg=N42}&Ѱ2AbZ4h h.?'ha0t?ZN]e6 f0os%ɿ'岏n"q}7M.%IKg-M ]6B0D/MP Bazcߜ$rY{qު ɩ:I4'@#n$tA=͂Nۢ豟wz̺9eAYli%_qL1\=s[Y/߿i@Fqysqd&3ZV}XǾor[@_[xMr?-]{3N|ku0^}{I %pq3,`dGh ø WINmVMo#TdpvOzEju5@xЭVa&4瘌 *][ZەYycGGֻ~ l"](|_c@CScf̵vp:7Ņo3B{#Vf fܓ4tO%Li޼yڮ9G'v\]uH$$@5$FKj26xUs4g֩OEwqڍ,5e_Tu1[1fu36G zix~ypopYe: J #߈ljQ^m$@O팞էw۸8򂿬Y=VP>*#OG<тzɱL3|!Ȃ6pKEs,'%t hHYOCTMq]OXWoU H/R$I$Z]o94aumCvK8;نۙ>p};uhNw~@ôeCUݥH$Iңh^I. ЯĖ.IH^Ïۆa,8`{7VݱJĸF[Em)C{PVU^`^j]$I %@bdp0,kEV,0X:d+5눿fݗG6::z@_R(vc[:YK$It$@\ Uieb V(/Qѥy ѵ@,tL: 28Ǥ$I]. ze^v fIc^ vo  +f-=]t;YOYߌm%uB{$I]. :rXY@)ĵYҁjX@%ZR>E7#0W&]9&Vs)MH.I$ #3ԍ~D0i[h k9P..M+uXYf}_E;5Iޢ @% N7zNYqn}9$IH/V;09,C(JZ˯ KY 8_KB.I$ %j}@OQ]ס}P$I$@-4en$I}-of e⮎i]UfuW,/վ pׇЎ̶>8vR$I.I@9l/+ory'^Lp.dcDF|-vc,7u8ΓA+L`cb}6ʎ- qnْ$I]@Mj"1AaUl2¤魯o[؎z@֫% y|'f~?b[I h5u@Y ڏoQK 8߳yLڬr؏c"L0|Yoñn#I$@$zYeUfVvH som.4o0 8>X2ά#lڅVqBuL\hZ[.NXc;8I]m} !I$=]@lҫҳP3+޸N"tw_ dC!M 8vtm_%->3c6.M|^]&^q">f&"sDA!]XIՄ bI9)&deZXѦ51d?V7fq$It6~鰤]o=T3Yt%G`{;5@d߄Ҷc?vQ?u"EWB}i/`2Q>ǧc}b_=IiPz*QQ (3[h&QDߵ1Xb5N(w#FYi9@ug>}A&܄業$I/vogp04B,t߿+q,M A6a]=s:cO:/Ѓ[YES;w %Ǧ΅{Yh Q~HceͅG.;tAt yRsЧ./]=ӷtԻN,XuI=Yk-$I?@'V{t}ah]/7S@c<7ʇ-K, OQG6Hu&69bҚw6}9c=h%Kߚ[ 5ܧ _} 񜠄IEW_fR m~AmzG#-juzʊ>go7Q_n탉[ FÏ&w#kZo.Ե܆$I诉:Vv]^rNw1^ǾK}ק]opl򦞴hu%* YفDPl$( PU$K$Iz"s,SeŴߡ m!:'܆I?B].I$I8]$I$I. _n&QĩNz1LCP?~ J.)sbra'gue>^%Oz $I5 xO2.QiҐ}Rc 7uاLP[' *}<昩$h3dkFkaڅI3us1ܩWm4ѓ$I9| [e[Rlv$XN.$':?$6F@]pɄ|&QVzq,ivԜ{}7>A˭-,"ñbI+ǐx%1aTc*q{7Jc}<"pucɗ &8qG'}C_oþ^4Bz:v/C'!QBNZwUmV _r0Z.Is sCcZ>(a[uk$*2F|͜Ep=`* YH2v2m|kpsӒws$ X|\/~!49Ƅo $* `|{l͚;gL' |C%I^'@\}>h=ib[O[I"c?1b3/ pCGo =33i*lo->.(3b[T:A#98k,<#u]HRzc(OB" :AL~e_Kn8&b{p~?̴Y]@gH@@tizwqw|S.L ֡;@.ZP*qqٞLdA$:Q蒒 P=Z$NP,(cG_o΂Vrs a=a583he4 П9mIR`ojgh VHqa_6}@(ɝ_,9St/̗f D6Ax~ͻOMpɔ@9K}_={+8tcp?`}sz=Ԯn~0$GqQX.['evfpܘOGq?38 s0(@#؏x7XFTٴd6 %I$I?)nG>WiR(E$I$I]R":J‡Z {K,QNvZZ kIq"H.#ָzÇI$I$$@g}Ad)^@"%IEcakMt )]T{El<1bDw 'I$@$zLEZ֋0ŮfxB QAr sX5b1_Dx>^cWx1~Ri˰%?3ъ]Ą I YYgk8݄Ǣ\d}_,M㱳'I$@!~"Lw+/q_ ПPgJuuXi!Ig3Z޲B ,4R @skD/$];řf{gל1 1ʋ :'1#[_4!po П A"-ڷto.3{^Yй`N'#LIJ֓&L1R@g'jGT-ШSN}mQ?t]$I$@L@ |m#1sqG}<Ґ(R9Heй1L l,X|S@grhptd.i]@I䳯;J/]Ksqꙍ'PBƒcnR|~Na`׏$Iz̴G;3qjб@YK +|Ke-%>tEqܟZel[RcMi;0'F2@lC eZ}rjT)I$@Ɋ4@4 2Q4M*UgKFw/jmf=چGozm_]>}U 8u|r<x.Ǭ$@W,4\@C{Pv{?lcf~0Q~z5hd)M~S@1ƌɍԘ&(a}UhRh_YA_a ؖ1⵴Z_e2Po6N7ֶ]3eh~q-@G;ou,Ϫ8q%|ߓ\s8].IypQwZX a~ ?LEW G4Ba?:X}Xv Fz @1kX+vz,:XE_8ɘ1C_p `TVIl;Tp`Nl}`Okt з;2PuNYPkwڀ򀾷I[k)S35BE|O wxeSf;k$3jp5oBy11cS u, m~DŽ{ڵ'͚7ZI7YK9 Q7`:<KYKǬjc/Y;2f)NL6ekp>ۆzX=7 g56x=:뙀  sv]M\$~B? c[٤ZEbf\}euu_b_|Ύu(v/[U==XYo xmcT+t?;?^ܯJioei]_ !^W뀇2T*o 1cD|Q,#}>2?f۫[Út~}k{|^9(ǿ?03} ӔػLYspI{kq:N_c.lϜu9}-y6Ox< Bi=9QL) -@G}0QIRuinNs?>yXҀ}-qRy0۾^~m@w9DO<{&aML9A8?-6s_ۘ7tI]\LJj"Ip -[|\J Ez 諁ՇPBh:YHXhx0^b͍ cUiI,V~om(QӀ1U _aǷ3wW3sV]}iYZXoy9n++o\՘aos8q\ hP{]c؆g5=}F5ͱ^ᚷpWU:߈,>?rcNV6x,LZ8qtg]OŅ,|8f 5L>̏փч:z6]6\\"T :~x'2þَzj% ΍Y{Ufګhcnj ѯG]N69He|^ꏉRoO].q?[U;ŒtmA N,uG2MhE\+3\\@g5(Ņ;xm~*>/ƛPZNP/[|:IޭM|7v-..-o*ܵ6tqϠN@wox×+h}wWt_3pW`?颠4,-L4K\Z >ُ Mw8+0џpq1~ln=pd~8i>GͅlpC#tH(k }=CC7 \N'.3~IߞL-́.s BPHuM-V2u z:4_\(Xcз}/Lm4iyMkTD-Lk'Ulݢa}yvT>wwu}4 kv"\|_0m_՘0D$5o,5kI:-XPW}(@tI$I]~M`ݯt[} c^★D=TK>n nOKtEiue4c}-FDQ9,$41{c_vl1c*\MvIld_sɦS;WW B.;Onkǹ 05]fs,">mH!|0nISDy~xatDѩ+sW̹\ N.@O.bz,% Sk-Zv -lL륀ގX8S@٦0L8CЂ!zU\}B eċ%{@_Hc_CiiO|?&,F؜ԗ)gb11w>օ;9mfqZ|Z4Mb'={ou}:63\:zm kЗa~e6 %[sBc6X*b"j4d_jc ,+B>DE'Z%W..`@{ݷ!@ʾp웻Pw4d[i8E N1۝z0fl&Jx X׶D.d=c)&8Yþcvr!,_UNk>~2BG=-;7 b4)!Iu0z6>w]-Z̛fݹo.H㛃’:_#~ Ce{#|'#Ϝ1V7M>:O>kl75X?} F,bF.bXϑt\cfҢLBrrv?Ӝs»$sf!އlgRWϩ#@^%F't'wgBF>mf;ppy*N] ]?2ǎ3[Z1)x鏄W=@KTC(&DZ=62Z?iTOz6hb^zm:fź./iM.;fQ&G&;g/t70_(Tkg[MBd@?ԫ1 z[Ou|bKj.M֮x}׋=Ԯ\&Z I9j_2{ヶykp!vu|ne|\ۤӂ cGDm sɥR@OsMO z 䒮gj!J[Й8gK$DNҧ?`d2؏) Í~]gfNfvCtX9sQ&&fE u#1%0e5|ivJwm3Djz̶1kM:>>&>n㒖^txKKzO^cQeV`,pq9HZߤ.4~xA~9Q7yɑD/e[ԃZ$7'>൛>rP (| w^*"dNtrJ't I78'aiWtǷc|:viycsBvKVvQ]|" П1z3g:U82Y>{fP]-z0֞J3h| B[RӊHy=\Z0I8e\rV>3u?f̘$,Zl}FASj Z9I}\[Q@;91#eo`=g)7KȲѾ^8LBzorkIr=sP9Ox-ߔPqxXFI ޺_Ϧk>U/tb=w>o~=5f\_,$6,3?BVf7ytEd9o  |ڀD(NH#]gN.)}uNз!mꛞw_գ]wOl6'kS.VʅA_Aغ%c\M"1e{5 )qDz=&{-9φ+:oǷfp^tSxtuۉ:]mT.@$Ic<ٝ=k t@),\E KrMp K318eֱL۲ _|pm,r  w>_G՛篻sՓsZ8rP>*׮5~d? $I$ ::iU F!zo0nݶ;pi[u:/ez};e.[Qێإ}7fAǹ|}﫾]E*4I=tl=tj|^Ӫ3C$I?U@'j+^(X,t,u,h, $9H?;M6hr}VIݫ]8hEp\d(hwN-`"\n`dh0 EI]~n.\0ܢJI$ILBGה2@; ʉ~߻r:tgV\R앹̵%ά^o޽g Y>+l t&;,$'I>;DTp1}VJEcxaqgb4"#|$±pa>\".$a!*N7IT 9i|4>I$I$ _%rVi*QhՄn'q>)>,ssZ_K<\{w>AP_}?ծ~?c@g,>g^;(äC}fC,(M7O a޹DEX0[$TX E뛢x>$*B 7X/tģf{dEN$IKPcP@qSp]HsLQY)Nkw ):=ItL=m#'wNmė$ItIOhu6*&BI!6,nH$ =LcAg9D%~7L=&MX!M+t&8LĒfyސ0L\iӔ겠K$ D,15כy׋lte}Ψ#LMpU[>LX[-=f0^&8nkYtfdkS|V-Y>i1+zYj Ƿo0C%I$@KtAd V"Ey I$] %I$IKt$I$I]?Lu|Kn~U>T~A> Eyp}R#0F%w'yUT?J$I]?#@$a rnq7>vO`;n 4SLus]/~|@۝,(1p>E,)MB5"T,UEI$I. _0},yK1rIX}n@#|N-vK8Cx  Xwu@iҦ)(Pcl{@YhGoqf>f?̄Y ,/ pK279<0Ϧ,М}l 2zknBwb߅rW,~}ΐ~U]$IpYwE=lAXکFWx~;зtAbK"`h'ܧD$};&ۗf Ry@?foe}2~+$It@Ge* $f3c 0:{.X]ҝԿ1,DcrOȳ(hn*y@eh7aX|s},un<Y,@$IK:3Fv}e|KeOrXs ,G?EdU$m#`̔rK-Z}Cז2}38OQ}ʷ k%]zw$I$@Fq,-k'EyZ}XItAYS hLRk$I$@$x¸sW(_$IK]$I$I. _@O2UY}[gWW55+>ްoO$I]' Пs_'s@ N8}D[X&_^nB-乙D<Ђtc^%%$I5  0,Dd9!*I]Qfⱟ&JDqBe%m#1LM2*c 8ރw9B^l_p9-$IegEfMKVvXmX:İE(IL{%D߶+3ډ7{}qND'3:lyf [[‹Yo'bR"O89 ',J$ItI1= /$ pQq ./I4;s⌟A8YLvSDy.h)1NϨzL$I]&..;n Sn,$<2SgUR@/ŀ:!,ui&ѵ.6Zg6O $ir~({ɸI$ItI?qQ 2X@fi.*p-̅ ,((tA}f3K4#.t~׻ *Ne}to~VL|wjAO}"I$@$3t{[H-jXđS1>m$ }‚ROH4x4],ڶ&]h:(SW"Z׭5$MG.DbOskpw$I$@Wv"\|sFʉo'E$I.It$I$ItI/pmQ&E7$z˾Q&QI$I. ЕI4$ziwE_зXl{\#ue$Iook U&WIs ^+.ʕIT$IKzQn ЕIq2_p${:Qc}Lv?$*I$ %}oq+ee}L|3p.I.v($I$@WtKtme}&A3ސ-Ϗo[IT$IKEDoI'L*$I$@Z$z|$D}_gn,RϥL$I]+Q4SD%I$$ %I$I %CF$I$$@:H)~$I$I]B4$I$I]B@GT|kI$I,E\\mI$I$$@lC}$I$ %IE)%I$IKt-$I$I.I4"i zI$I$$@W&QI$I$@$I$IKt$I$ItIK$I$ %]$I$$ %I$I$@$I$I.It$I$ItIK$I$@$]$I$$ %I$I].I$I]Yvաijط]C-o?oR,Qi{vbӶ,C7~a۝;(7\N?$ %I8Qvw{dLm]W3`;0zu5}UUqU[h{d?x%8ޏ]3DzysYwe֓IsâX~$I]K' v^y @Tb??, 9@ ߇!q<_.<6v$"WE@?w( {~ΉşmDߠ=~RpI6+~ qw;ֵd-b*ߗR c)z`n{@oJ9}mX:{S}a7Z&@a1fお a{Ko,kgMhc,'ZM jփY?{ mgGp }}ٗP9ir ^Y~&; [ @}XЇ<qTgulO(ͷ>IU ڝ{c̸^{ZY_?$ %I>FV>RIprq:B4> W 8,뻼5¹zAkucԅ$ItIz қ `QGk3>Jt1`4˳Z!apz oqtAZ=ѭb~GI+1A&}?ß{)&롥wYɎT`ܺ_^c9#}?U/_"XIjł>I> /ɶfutB= tqDNvз檁<3@hF] t 遫`/-~(!G{ӻ2ևY'w6 uI辴Eso kS21>8rC~`e_ܲUysgD:P/OX%I!SA$@]zɿFSi3QY&α4`Bߥ[:vNrK I?_} $ %zUoº.ZS_hoI4gQd$IW3A$@[߿+|E $I[k>I>ťo94Az'CJ$Iҵ]3;@>I~%@g>WCہ hY m]ʢ b9aۅ2P6U(N֫ǞS'amZu>m~9aa]hjf ecQbou-@$I$@πdЀO:-T@W=/n?Pcб ;<& =^6L~z;ԃ}MSp/@$I28 hU;bޝS9@!vfQO!=6u$8>|O;qSn҃tLz {B]$IKdfq<(il tZauYOلz7YcXE+tbE4U$I]YR=ksyuǸ'z_rX%N)Wm83u_Zx @{lsK$ItIzD/ݬS (sd$l;G Gx7Wc`K=el:`Nu8Q]%q-UNlVYD%I$$ '-riޟm.' @Nta~an*q.|?W'yc~Hi~i? %I$$ ПVuK$ItIz}}^3RK/S] I$I.IO зͯmu}}^oy@_]}$U}+I$@$@G;EP (ˀp nxx ^ w({YJ i[ʐ-Q}oK`J$ %I>%@\7g,` @?mf`ar3ң|E=-oywH4ۗ4=n8崶z-}8\@9Qw_ԵM:K~d&ۏM.~-1q7Mb$IK=Uĥ- 8TQlN,zpN @vOvoƿ[bݗf%g@ lh[vN/uy.. ڄԓcvchun~R`|C|;;B؎mx|rҧ(o(Ǐ- cQI$$ 3hgoU6-Ioz is՝Nwa !WnN\\\ 3-a7,!_7.VL",nBR :.&c,"/}u؏,m,MEICדDOǫ:)7- ۰ fQI$$ _)Vr|ԘsCZ/py磵//o$I$@$I$I.Iݾ쎡zd&VRPҺ~%IK: T?*E+F&Q !Rsma1-@8,%p[^.H??7)^$$ o4HX3#.[:HAFT39p[H8fmx\RN<Ժ_df/́i'Yi '9v%>:I%+{X$I.I: Zh. k W0M&M Y+ cH@8q:!i3Z]YIl"P?FK$1c* Գփ "ݟf! g'nG> }ĢgA`<*DdS#bOˉX9@Y'PuԷE|[?qo8 38PE3f[ ~oK$IutsUH-)0v2N!xas5f'\D)f\x\YHťDq3#K!΅6'䨱 u JI 4\PM(c?cUS32;aYǸa1פ(|*ch6l<$^:I$@D53>8&X+K\DfYn2{@}`q>r}?EmD11S.|1L3Kx,i8fk ' ضcM.go}'nlH$@$yf!unS_Ou3L&>"\goV#ЖR|:̺:c=-Xru[ˇs][b"_N?%PڛTp̮K`;VvȤ@\\B{ܘ=7%B,kurr&<{)-cΉmz4i$I]'ScFqٚ/d¶Hђ5aYKYWMeJ}2M7"Xǹ6IW !D1T|܎vvgmd"}N^'03Mw`Ug8N$-'++=qN򚩛cvUI?YkanHI$@X$K ^Bea*``L>n x~2cdlK$ %I~[@ջ+`\odܻS+vOz2ޭf dtL5ΗNB ێͲh-3b=<-8/~3!QVε&3΅L^ěLHra'('B%8nO]sbݏK1΄r>vI$$@  T6BUHlG-!L\p Z&bְ>;up.>9` &V[K3 'v.Ifm23rۘ $(wg1﯅}IcLއ^\mi/?a}",NDa$IK'Ðr,.v8ׂ@!8$D[N3e:\̖80}8\IeDpLD !-q Vo3O2LKM-ˌM.71v_oNKUˤP rY0~m>hfYnbfw:ۇc`<sDeMeo@&bjKk B_P:΋l%I蒤(.G,XG˺zpK\1Ґ5ܷ:nnl阸rN*I$@uKc&N1%I$@$I$IKI$I$IKFD;zH$I$@Oť8zH$I$@ON$I$$@BD6P$I$$ ЯbIy$I$I. "I$I]sd_K$I$@O!~Rʴ(I$I]+$I$ItIK$I$ %]$I$$ %I$I].I$I]zhH$I$@$$I$ItI %I$IK]$I$] %I$IK]$I$I. _C@o~(zIܷx\ʺ9h8> $ItInWblև~w2~mYW/ .f㩵c5Ͷvwww5ϗuk1مq!p%]ھ'89$I.I/@oc %V:SsB,9K//W vO gsuςeWuIJux,|OՆv뤿ҲKW{S`8.ܘa,L|K"/cVWK>E~S\se3}/I]Wt!!a侫jc-@{q;_@vX7p8wkmly (uEH6K!z|]ae_.@uGXQfk : 8G7.k# ug[}E BPWx6E(1e'u`{jW?h [X\ u$'[Xvq,yM›3.yks8^#IG,/.?7 (yoFﳜu⸠zva {AX9A3{(tu]6 W:<1Wԗp \ۄZA9x/u緣#Y7l{kEog8vrI}:$I.WtZgi?(Pv[6)lb Guo `#nZsum &cE<{K}N~r0km:|)X56{M$b fk}5}pe |32u}\_P'@Ufb⸕tw| &=szn[ZWD$$H :~W[^apS@g :z!BｹH{+t, &+[h-Ņp޻<5]ik, ۃ.ME~S"<+#Zn1CҧCz  't%ݬmί~ Yn'ؾ{杖^C+IUzdx!J/V}i=LܴJp({igY ˧ی]Zţ_shӿ`Xgooh:t ǡ̴X`衪&B,՟JCfr<@5mJm;s&O6ωC&J5}૓k ߀Zu.ƌZ7#eY1q]EOZvZJchܘW,CQ=aRw~K$@/&QQ=ݻJظHrXGiytFy8MMfQ$$@ADSwO=I$IK$I$ItI?1ERBL&nsLR#Z5sABWpIٸt\D(p؛Ҳ]X#Za16NbYI$@_=le |}}ʒ|t. h LsŷzۗfG$_(,5,.bL:By( :듨$9kL8x̍ORmB^^\̽B!!{pnJF K]-1khkpǿ}ZB>dfg4dj !̋K4e$sEM}χki b[ɢBGHcDMley+OC#2NL 977 LnY1ćMϱXNn :9mĕ_-nXmiIҼnN ܣV>X[fۉ4z2;'ê$ItIz^q` ﵅m V}1bzav!&z[@!VWR@%K&Sxs0heaKŒ7-aciy옛`-N|?1ï.58O^!}b1υ~$E•Mä̱$N:IcƧqw0TCY} PkG%I.I1L&kziIX)(ۧnN׌2)}Z%$9sr"`}p# |rBVӌpQC_OTG۰InZ-7'Ͱ-Cv،I%`+("@Av^~̵$$ %I /6W8JCFsh$t |,sLn\lgx1^DwBogM_|=n?u'{ ȜOb-uƕv=$3.!,9zm/[Or,t#ڐNdA$$ JI .7=czV<,xv2dt# :.`]r ̢?~wȮu.,VŖGfN>,ho5f oTI:G%=8qPk.iVgh$tknA/Bv_{ NN z& 'eeF~m[1~>E'#uw}|s0i?Wy7&$$ % aŭi.>w]:!|.*miBG%I.ItI$I$$ %I$IK:?vYmr|LttɠaT4̅eG.$WvRdtI_s~g L/)klm+~rQ)ƪN a^ aA㶜<>uϝeѿ=,:.ͅa1_kXfՇOoۤ~A.r1yQn'4ǵI(<&u?i_^#35-uu',~o"aڶߝ cS\T(I=g={Zݠۃ+ g-JtI~S@odi!Q,(xxj BYIHX!fyc/;cH?tbj%~P˂;11TjF7<1dk㝋T̔&3k2$TLre1!mX O[NK&^>d" ؃4/CC[c½a, `>jDfQB4[l(QbD& /\3~nMnP|S^]Ԥ0YcmJ A裐X[Bwruu&'-Ӗ0١>~m9N^{j˶041D/J Mw39SKe'NBK@&va6]c7K+&,NMbҚ32d8fd8(%GupۆЃux_YB:l r}z?f/@Ip]L,#kg\Y}ln0=* dJ[-)2j8DF]z::cТ7)y-@oȿ1$-7~xYMxͧIJηg=/ӷ阍,telNKpq?{#3!?hku8 (f} -KW! t7t!1jC~<0 hzp;U?_mVIBc8K},iZI3}z>Ϣɀ Y 5+-c;*h:ܫ$V:3qҺ˘Reێq/\P: pOV+)"{ߎ ,nf'b\8pp]+_a߂,tZq=쒘sS?̯IuH3f{TnofPɭ:՘ߧr!MI3 I:-ܩ>J~ Sg볙&/LBZ辽>'|?v Ĺǃ7>Zq Z:6;u[1g9v?H9@_e5W?m6I!2Kc[ГkShϖ*L,R@o~ ߄slЏeE3jm@Dֿab{X$@^7 Saץ3.[ʰXr],WVL#NW瞳_mnk ?s+Ld] ~555f~>8|z %]^$fH7Zgun$@$I$IKq'X%.LԢ웒$I]7ddＶW}.$I$ %Ihwu>H"aY|d\4f(jg7$I]jJ@a*/cNVa4j&*:UYlзۏeE :u!iOCGS͗$I$$@1 |ndMNpf]"hW 6cvHRTY$@KHT@8z1 |+y$I$@$YՂ>ú}`M6|ν;>-%D$X%ƠVo3]^q]9n*:I/˹hF,؞>ube$I$$ƀ>eM>tXEc`33@$Vmǻ]Gy\}=>;鱬]8ra8qf^O\^]$IKH. #rte"RI$IK]$I$I. $I$ %I~b/q#D7Oa1 j0hNݨI$I.I nf2Ή!}ll8ɺ:>d:(4;3.EI&>Ԥ$I$ %Iq[8@\36|m:fqȝu*}1z}R6TZuEy$FEm\T?"xXg$Jm­&Z$I$@$z$a8wv,լ@V}q<n@=jA;1RI$I.I,谔{%dBԐy4nS8N}ϗXCUp9SZ -aB*ɂ.I$ %5`'w{`fb:UexF8D Gs}|׽u0}Ћplmqއ>~=G~@ZI$I$@$Eq ݸY?(lcXjt,$I]$I$ ].I$I]ݴ4h޽d|!_*cʌ*I$@$cݴO/hHbd@.1 SOR N`a-?C>s.TVǀbY QBþTn!nk\̾Eh߇cՏ$I]G T33žw&Y=:A]]kQ`f$y⣷> ڃ0mZlG>H! ǨK2j 0;ؤCS<T#N_+_M&$I$@/-(_Z{y{:8dZqn\ڗ  ο~[`Kkц`\up'/?:]yC'I$@$Y//hBU ,g^Rfd)Xڝ_7܏ViR@;ם[@",-lS-ǿۙ [ O?=|v˂.I$@ /-`w}k03}pNs;!έ5D}q|fs'?Nz [dz~DbG3}; uDIƉx}fB$IKHg J_EK.,w>$5C"m1hcɄVJ$ %I.I$I$@tI$I$@dA*}xok/u(I$ItI?mz6K(oICB$@>i%@=VbЕlgT[B 1&ʲ)I$ %z}Esaw;D'.&<>S}fR1.!̠EA5q‹uv|[g=3cD^1\/2 :0(-1h=tyL$I]{7x"0 e1C}Pfe' CXP;Go~2I@,n)&.81]o G!ѦZ(HZ}D4=JE$IKkU$=>-HJ,.QLaO`f iog㲒2' i웋Й͓@3YRZ7!I$IKk?B/-ڷrBcBfݻhiqDy ==^z.*;&_ZnI$I$@/% o{}|7^>Q69@Yޏ~N;]Me}-szpgI^Y`Jx~ko}/++ȔD(%k$I$@ (=},L]W+I$I. $I$ %IKzH$I$@Og9$I$I.IKD$I$IKG4E<|7 (I$I]AGj<$I$ItI~@90S%S%I$IK}..s9%I$IF&"QI$I Y<^$I$I. ЕIT$I$$ %I$I].I$I]$I$ItI] $I$IK'IT$I$I. ПH&QI$I$$@]$I$$ СJ>$I$ %H$I$@$$I$I] %I$IK7dU/UUj_, q7:Dyj-EכaWWOnzo[WW+5R5cvz}8viCKO]zEG׸@NKpA`r#9a)/ %su2ޢ_O]nqnB eXMw|= & ys47ftrIYck\ك&[Dk =\W\&uyn[21ǵ~n?^>\:fOz-ItI_sC1h΃=KU`P<|y]q"~T#4FGZV+ -Iz~AuAQ2ATFX֪/u¹ anR@q7n&EBѻa"\7h0BKD1 &ηу[p/ |}o9@Ru_.' u3a%tzrex ߜ(/{3 }SL^+~“ے Hj𦅓]w=s8Ndw9a]´__;c ԑmׄ?_-} +yqV;ߞZd?cb& F&L~8Yg '~<+}{UH[I.IK_Nh[o\\rmmtE.N_^7C@/E:w,Amu/xsiDŽux(t<Ф(1M⛄"'Z9 :ʤp>gߎzW\,9Qy(7)~;Kr:Sؗz\-#(d}0l6iYG\G(OZc}:8 Z7Q7бoqq ׳4uKtI_ : itѲ}N6~$Cc/e?xkqsX-d})oջmx(9S+&Ma|Ђv`R@O Z9tR=sM*I\^Zd?)1[bAwcAg{f'y s&RnvAޖg桀qDVs&u}ʹtR·Js^aR]Q7[$@$uRП9/OEqhiC@/M,!q|Ѓϯ tQ~U}U{Pm F,A/2k?[禁e9Wa+&q.ls;߻߱1w_.#8^/cǷz2fcm]`z5-ƭ-?b21Hx̍Y`r>~>L_%>:}c$]_|>S籟G:ݚk_s:k[9 @_Z7$$ ПTxk{H(4c_N}z.7Rkt|&JX`9}%ItI?)宛UK4&~|8$@$$I$ItI_Ө#$I$ItI 3)I$I]?@?7}$I$ItIw H$I$ %#:qʽE$I$$@R..:$I$ %St$K$I$@Oނʨ)I$I]?8teՔ$I$I. ЕIT$I$$ Пzw.֠iquE>gX?9L]WgϥZ9i_y@ o4΄vM:Q nPwbp v](xl=Yɟd|m3Ppzcw@ nkQ̽MhizK]f `k? @188;@ ILYP=$X\[}9ld" WĢ=o0+}{Gѝ/=Ϙo'G^:x 8:xK8>Äco~DO'G׊$&l>g0H—=}>DÄ%8u귱Põl?wL\78 9rMO%I.IW$?J&^ n 8oOÃlBf>{Fx-g̫pƸ\ Я@Qb4z:/q$pƉC0L:'F]'tE¾a |9'Js:XB:I}S $ItIB c`ջ^D[^drU:H;K V}%0 -=ڣc..[9fq Еc(&+{,6p[a_O-ml2y׈%]8IC[̧@| ?'ZK.-.Ƙ \~pp÷qmG=m JݱWxsmI]^ @[>ܸz {.hKU|V'{sP!D!/sKHF.◜I\YB2=/.L {m|R{a`}y[wM \&Pi9 sj{ZAZdI[|2>87Ei7V\T~nGb9|{ T^s@݂>I> Po ծzTu窪q՝m=RnߞjOij׵͒?Ii@~\$I$1^P' g|;@9H/Q@I$I:@|A$@lŕ۶ey({MwܮXֵ `߶]؇vgc_X\|FX6 NU 퇶8N$I$@$,$F0phg!e>| c ?5Q`Ў&܆fcA;0&ar& tI$I.II`YU(: U6hU^Δ C5a,e6q"vnt@ze3h#A9ڏ:pr @$I$@_pk!(ѥ#Z7 оw_pݘ݉+̘U>( 5P.Ktrn*YShѯO{sO}Z27_7Llvq&0tI$I.IQ\*:< 衞>z%] -:˧UuVJ ßGti)d8)y|8K$ItIzրT1aRPA$I$$@:o뷖()HV?$I]o$I$I.Iڶ>l6biswO1vUSyp-Okſm$I$@$#i  nF{OSp;A&N6 $I$@,J 8me9H}X@mZ߆x<}WWMW.'/cX Ώt޶$I]zӞ|n`ܜ,tЍi| a^28ۛ&errm%o;n;8/;ahA$I$@$S z70NѪNXz ]spIM0wzH$I]Oi,9@\J z ČZ;xb\eܶs..{H$ItI?9@'l{U;A'pWR|okJطYaYoo~.67~zK$ItI? ҝZ_[=%I$$ %I$I].I$I]m\o$I$@ 2gt,TT$I%:S"2KhQa19y2wQ871c=jq$I$@AA]ч&XJ1L7HǿHr7gF_{+4K832i|iޘK2Zz@K$ItI,@O!mXc&/bң:9~Ug|]?J$I] /ɉ;w[ ^W}b:A䎇k`]$I $tXrb`Xʁ޻`e$I>I(.: ~' cuI$IK]a_#Q_$I$I.It$I$ItI:g1c| |Q~}KuQoÂaN`ېnϹ/ %I %k{_ء7b/ck@|ޥ wg2J{ }\uGPc``ѮqcY_uc(>$ :u`&$:ԃ=u1$|  h%^!+icpFax^pzLHIFvFZ" 4%1@숊35f[ia.5`YWiX{i&Jw3s^'] rmDžGXoeG]Ө@so^$I$@%3`\B [BYeТ 2}&d݅87sǠ)XB@j0ceYP/Ѿ8I(F%G+t_r>~c0{?iIR;l\4B'qԿH @ c߅s=Mؘm]vر7({cWFl׉u]Db;8k@?ڒ$ %IޢqYrS9 :4쟹Q/FHasEqԔ{I 7NzbeX1LqBX]m=ts_'LP6Z#+uȳz&E)1, ܬ;'jwړq%I$@Ҁ$6-!iP;g ^ nʂ+0):l/htZ]= o ݄䭝#hpڙY t[8Q(Nqu3NIQv xe&M'GԂ )I]O b#&82sP2t&$] qڬIKu$"K 谬*L:v.9A-qcʁam;Z>@Xֽ9p')0WtoBn? YX81Uɬ޹1XܢPw(O,-^$IK-*=gr"%n\zi}ScW{azI\KK}W]?a0#ط7/K$@$s[p\F"~z s%IK].I$I]ۺG8Sls )=pj*'*\x*I]򁾶 u۽[1rzqnkz_5 |]Yt,L}υmO`.t3&~0i[,MJ$ % nPl}fu>唵!vBAtcA 1Á޲!3V}o,"H(1%̦7Dǩ"߽pZʕsX&yƪg(ͺv/Dbbpzn2hQh'cb(^O%Im~5Ͱܘ!ɵh3$ %t13{1$/jcJ'2J cƳ9|lv0$ͤ9t":!%if | Cp.6y&/.!Ib,7c}? ˊ@ωξ9wc` (nкzDX>.9@, a%-)K]<Tnk9z^hChbsljjʍ ?A]$ItID[n5{C;q;/{e݉KЂ~׷[S@5kutՑ@HJԴf"#bIJf%.Jʬ,?{9`,L^ >&8ז$1bsP@got&/K ʼn"$aԊx]:!M{3K$I$@/Ȃ]L)B9"zHN}ջΎ☕@-:ٍ:'!M}rU(׋z|sX%rS@ɬ Lΰ3f7>i57)߶I@/($IK贖t`H7U:}%Z1h{?Ѻ}K=dDu5I1CBh,kܟey%$Dtu q]\"$|=%7oB8-[@_x}z`_ά{\37=7fW/I. q聐~šҎ/4u rQu08*2Pu{8؞t]eVպ_opyZv%IKt$I$ItIAU?zcqUt=yUVUI?I.@o0{O^1a,tߢ_)NҘ?~ɂk>I$$ omeGpRfRh[Reu໶"~H6㖆k6bb,dR%Fkc"\:!e ]%},C`3mЯ|2@$$ƀ~ k& Cf'l!P|YvE61!ʋ+ C,>LaBC׵rFPpy.4"e$M^o&P-BfdIԍsocf}&B6`eRO2zxVi> &Ƒ!Kyk7f_21;ЂkDU eȰƬxN^~]4ΎM&|,I$$~%t17B4I@茛N3˾>cc84PA|  H7}[! uaʑ>Bar$ڏĈO[a}YivBdTȕur?uؘ1ӧfk*r8fn|ʮ\K1X"I]?|hue|(4XfD܇,sN'p5!н,鱵Y=0y@1'cjXߨ3,YYK2d䦀ξM/tzn ]& $ItI(."[jҬ׵]B(.xnB4[$ItI?H)n$I$ %I.I$I]/ }W4b\,t||-StѠ_O4x3rB4$I]V%!mWڅ1$RcL^} Sek̵qsc2bsSq'u΄ť(.Ozp"V#BQ,: A$ItIz?Lby["ˋvyz.[l&Q!1tL*Z;7| @yÉ);KN(0 e>Yf3 ,UUkVogL7}LԔsQl1@s4쁽tYY7 'P*㑷fTh̲z7/&/Zg'~>3FT }m?7<.N{˰tH ^%Ie eq5Œ/B$TȺ:AGBd&M(kƺ^w'YI9 W`6-gd?4{=j,*ㆁ n~K?hKҗi6Ѣ8݇ la`966m=ZܻXI%̮N 'c1I`.u R6f8H$@$eK-*lL"10D+|)S@w\Lqۑt&mu0`bbR@G=i-[n!эs pW>(ܸ7@s |Y]\uW{o3}VM]ߒ$ItIgw$J)58J|H3.tZSF_$%Xg,s&Un$`GzKc$vW/7 x#@KM %D[];o#]\x]%ȇI&f>q}ϲK$@g Սؼ9?TfM7A?>=;_zj->DŽ\Ė2{HjmgطMg}?[pLX6lx|gWwZw &og&8k8pţ{_ƒk|Ya2,|ƌ8~]X_^5dq_6׌J$@$EqyF.SHNt[ʭsU8焣ˋ$ItI?E@$QCJ$I]tI$I$@ K}&MZ\քA[ DO@?db C12SMzut#^ךbq.NZW0QT*IQ@h1z h8U 8@.f"Vx9Ac'uŷA1=|Ѕ^u" vP)|lrXe &Y2fc.I6C`cߺk$ 1@L2VŨ5mz$_3z["D;4Hdn~8/!]'r`ų$I. П$3! ~X7Ϩx=->ec=3K&O=MzZ ہYFrY)}6ѣ%|ؖ}f:@fDKJ}ubc#߃1;cb}zZJ>iU:aQ..>l<WLckK ߅{>N &? : | $I.IiA?\:@P@Ђ͉2 rHvoG͚9x'p0嬟~|W9@z.3jLس9P-$N9>B1؄^}mu&!Wԅ+}U_'efTqCo3$ %I..#`Ӄ2,^9~ [%:WǬPr?A5זrh49o|AY#Yэ~ta2Mf _ٿՋ~;t_:fbfa⹀}OPfb-!o`,gjq91cLtU lDp?!sa>a{a㟸&k2@I]e>CiY%Diw IqɛEN]u\Rc9f}V]/=fIM^_ɿs0A:W]?~N~efŏ ·\hR$ %I.ce4?̩g}2ԗn$I. $I$ %I~A6>}i7I$IIzk,7X$I$$@".. $I$ItIZH$I$@Oc(#I$I]E$I$$ S=p$I$IKW Ⱥro$I$I. ПBŶ>IE/I$I$@$*I$I]$I$ItI.@$I$I.ItI$I$$@K$I$@$$I$I]$I$ %I.@$I$I.ItI$I$@K$I$@$$I$I]?5@o꫞&6=55w֝ƥok䩍ђ1;Q?ؒ$ %IȀ^vWe7*(uu.:v'p,wY?9;f;3+׋ƻ Ѿ,})Yi u,I$@I@OAf(z`[gʩ$^bG87[l!NC6Y[צ{SDgBpzN5zI @qi`YO~Fժֳ}?UX3cI?FVuI$@8 vuՃ(! Ћmq({(FyEy6eupl[׽% y&@ m*H|]&mQI0N PWf (\D:a=XG'X7NHrc:q#`7zXx$hݯm?>x/0sv }J rs< Voel%0$IK,NGH,c1evDz=8т z@h/VUXjQGkaUq޾,*YG졕Sȁt0o܄c{t3^<hQ?®@˲:.+7ycUUL he,-I$$ re|xa. ,-u< ,UAooooW8}S%c8۵>@۽~z^0I u[N}X/u!+]yKᄳo@ K$ %Ih1 -@W`.gdz0O܄xLy [.`öYҷK~ro}Y7=8 e/\E@ۏj>ke g{)ud;Osh_?ƪEs:lmQ71@߻ E":ݠP&~rX^z+-$I.I x p H@*ף7BP؃#~8fo%R}A+~?Y%oovt Μ:VoZòPMH l8ec36fkƴO=4s!%'=^&ia~$I*3..UUi]$I$ZVL' _w'`("}ۅ:e\^7z8.,O>?9ua{`y+$/! Ip CDFp$``H$ QR2 H D0%*DKdžR,,8{=ݫm̹~9g{=y굟u~Oyͮq}Xe;v֏Xf@y/\WUՈ>GL z~k )1=&o7AwmnǙ.ylkMc^k jMt@x(&LP1&!obF_ Fm? S"AF;fھri.ۋ[lrx:G>sQ_˱1J1qcyow۩x<;r8*#8>~J[cYu~磉i|bLU7r|/I4N 9lH_rbO9SDCP=~f#ŐPd|>7O8)"S9گ(U{KA/z +x-m'COx(ZծιJřG@P>&h|ߵ=sV>@ -UZ"\") N,}btNNa>%z/>ΏBHBeȭ#O\Fq|2/[-؋Xe)]nsƹLeh,at?';oOOrįyʹ_x7I_oׄlK^Fq}|x>19}>@QScN0Q=)qXĥDB8җ׌2Ė׶dft:D@:t:W襫J>4-Uگ|kkNzc5{RkԥWuMkUڲ}-׌kv8#/Z)EjTT% mSJ5y5~T-]fO9紅@t:/Ib9 @v{nqW}@Hq9 ?nn{I/~_צm8ֶڍl{ס6X :aY=e9v=6M<4~FUk~g]t_G=s^vs97Qd$OiӾb;w<):qV^nqrǯ~oF>~ 1}gEyZ„~zB5bB&`B'2Z#&nm𺽻|/mn`Tkİg/u;']8mv,7 _o;"E վmg0sS[}Q}t}onomO>Ĉb8q4P$VQνfks$isݬSΧiPFŽ9/~`?7Hiǵ}\zDyq@+[ݫꫵkmS6II׿=?EFt.ff}OJcoz#Rۗ/\$^5eӼ6&$byLoD,}fjs9c]"R&N:8$i# IMTpsMգ:4qtEC>v3js[Q|>H& ڕOZjZaS~5[5l+DY7 i><l#t4ccEyǨ~LH)M^Qoy;:j\L+qNi"v"=LA_sMqibyʃ\=I̎ t]SHL_"ЛkV)N)D))? 'brS +GY(sɻ).䩼&i=;մm7ijնIIy{+WcRrwBiy/GlO9CEgagѢ!v鋠FAпb޸um)Zd^)ƅwǹ]Է C+"YwRR3\rqave:շQ>,܇1ޝ\Mgw<~ HZ8oeg\F5is7}h,BC5hGX}>s e_NVwI4(5S_V I1{ktS:t*WJG$ah'ct8u\]#:eJK+("D$J%їPITAY/xM,%9ɊѽCL/UhOSA]ɾj2j6zb&Ɋl5Gt7#% N[EqDu9##,SIJT}J\#\[ak޿/}(Уo_(ϔ&p/uyh(i]@ t/Amk==J EBsf$J%Q*>o%\1^+rt)ozs.&O)hUjA@rO%Q*RIWx_).{P).me,$n0^)nC).wɤQ pS).?=Ro6㭰x?zޯk~eǟsEa]U-;9ݡo,xӶ|YBv& >#bl-;c@:}@7qj~.y(M>ũ9# 06!0q:ḟfI\&^ {{M};6>Z66ct]BDDE7.F݄1~`A籨ݢ:dy&-)^剄Ini-&8M(R4:GM tqd?!O&&d@[ѕ2GܬX?T!n)3K:&4Mpx5l1mۘ5R+Ď9moڶ~xOi7cڅy|r0t~rHU=8򾮯#FlgW zcl`}09Xu>9㵮 mQ[;&⣐w"bq}AjaZ rK&v~;oBPM_\^7&-UISJm]|[z髴" =1Oi?hw^[@mԾnwkgg?nc?yeAƊTc7\o;t}y&םiwڪ1n6mc[_m[U]{ D~}]ܤmyWM;v!1?9E@@M"pшpAL@5 յSB1(ГP^:/<ꪭدD4;= ŝCڏ6)јnXutG6QmMbLXۄW{qnoocT['?徭 M|rqsq)_jc5| 3y463$1:sߣT CEg%Т@D̃Pbs,֦-\ cH@P6%IzM)SeTooME[_l`k?ec`B~@ҸZ5MףGD?@_u_u_<@ 'R[H= r[@xW~"DD˅JH }QЮnE}{/O"Ll_[kTe|{۳r/"I-ڑ@@_MO)xWqA7|vq=߻ٖ[GT܅L9M{i }0Q+^9(]mU~Qs7]*_Niy!?_2]ۤ쒅@@!X\⺢HLtb^jXS: W#.ȼD慏X  @:t/@緽y)\%u>)\Piܯ_uO!xo<{ϓhړ/x|yq~5}:*yɶE}* dၕ;^9& mG.ʃ|͔@Jy1}ڵpX?:-բsiJǦfvsl' ͹Ol tDQEKUQBl!% t.M%FFBE#Qw]BU]QcDJMIV~QHZSS{]m&{E[+ Nre̤csѮcǾks֒BH: 7 RFǗxmS\\Zl$0K^X)F;-0WbfZ,kJM5LN@S>i@ Ч}k}"TUEyI/vnQY[@ FGtmx|DV>KzϪ>,(:v$䩾J^68umբi z煟l,V#xTT|(DlQVs)F9}c݁^37ܔ/+S: M|b6&DP).&8UTW NtČ 袼|?u5}c>s-,5]=qޗ:Sn{A W'k3&p(RX@@} tYҕ IF_¸nnq{hd5 r_h_:VMeCǮ'->wJ:燌(zopxWS @ lb56U<V9xEcļYDGaEϦ! vה1 YM/.?x}aa7j{bO-T%N) t9D +I>q7aW#n-9h_`tKIh7.GJ˶VpFukyg{v k{(#:ʲnWLU?m,-ވxg*­*cum˪SAU}G~H$֐&mWbv /bjz $J=@F yF++貈˔@¾_ ȻZQ졔+J*%IS+[V"}$QWUN*B8/#6Z3Qٵ}>US\*Wȩۦ_qR0RS?{ O6e RȖ]}TeS%z[s=*KYtMwJqt\w7NXΩ&~t}[F> Y M qe=H4./Z<1(}^Z49%:MŁr%V|DcUCڗ7}|P¾I)Og߯b" V%HlDg>q@G"*a׹qlsÂOmq+}lŴ嵔ދE_v_I-F /QO)gW==mGC,: ߱@oE""R'Cfq80_JEVX"vZF}@$:*iet,/N-U!H=ݦt`J)_IWPes|s->vy̫il}eTI6Scm-zRlqs +c_4Q~-7RSVM:\uJV/Y| : DQObr"؎ą(r*cCшso~qKhOѣ 42-Q֦/Gp%U!5_ -kOb=w׉Џ] mQIJ:XI*F\O>z"Q K&}(UIWeg8!#@@#((s5E#rvQQ'A $нS$z@OWzӶjdU %QZmT! XhLk|%8K4&ySyL#{!M0 {)u_V5c9},O1KOtz&y@XFa9ZWo2TNE$@g).MURE{=(%@US)./s|Xѥ@vEZHRVST"MUk["6\b4EC! xDqNAEoף~ZvR\~zҪjRMq5_@S4)]T`$[Jq9DuٹGu_k?@'DEYTpGbbD7^q`3LTJiՋUI 8(+cQQU-B8>8VKU5S_]ػ+jTN.b*W$KOB0څaBxm˱O3>z{ݎ[u\<5@ }@` u_4A8}t@#@;0/Em-tYm͋~y9v=`tX' y'wszo󻓃KǞSqwPI4:Dkntq_yFig߱k XIR /d"ɑ&lg Ut;)2Εeg5_GAPF.gVG,,e+­b3zW[칚퉻GA]Gl KƱ~:-ע6|I }[WE#TUt8xG}F%Q)@"b<%UF) ھOƉDS@'1_oY';Vr( '|/UC^c~@@Ox9?*8*a檔U#m'*FlBx9c|VG*^vJj.St=ZO4 '}~*A @)./M J(ңEpz,JKTTMS!GRIRVWD)k/@S2}=V29]Q~1WU܄RO=E*-.ݑ@@E c)R bDaJ٫ҤsUS}hSO08O{)ێmŔ#=vՙ#J)n}䐗Tݓ/(:ExʱI t@ @GEZZ*T>G3>-@2TORZV^3.Tm.^7N>箣H63 Bu 5"דmr̅ZݎSZ/OL Gy'+Isqkdx`s-,-^QIAT:ąa9W?xO]s'wtW,C=jT-Q(\ t'OBA!h֖ER#}ooo6=&NJ lNV"N!~ţjTU}n1Y XS*f oiqNbP/&/v-Ofڦ)'5PXTa:<< ށ@_%jdbI!h@$DShIiwhl_8 #Pts<rPPHI+߳Eu~V&#,6+zWEY_|W>1(:hVu=W'E9]ͥ퓟Tg?E5ck ސ@WAyEfrʮhLb6?{f9%MY4GL_[?_~@>- E*Ȥcn{vqrDo*d!]N$XD/$OdQ.I5c'or8Zk=ot"ω TC)5b% @%QlB!9$c`ڞ,L)6Ebu*ԗ+Q ˴MLڱz  ;)(搗'ЇpzݤtA_Ʀ>#I+jR8:W 0כnuNTUGA|`J-䠯N*vOڊn󬗝'LG]u&t+1|M#}):$"_IvzRǖ׹\Mبr\bzS^t{لs1(\87oMz _~Sp@xc@T&@@#`Qn"t:ז&E/HӰ\^9 E>xPyktD ߹@7!\u=_y\|c檔mAThNJ 1aZW j^m u C]5EJ<9Q(c5ƦRerHEw„@g-AEųR;MC9\8(w*{]U3T6:jqu Mytc@Gng(+AyKgDnXF̧ )j),J;X^b֢&%U2p W%;S[|* MIROخ*h}-,M@  ЕƐ+G^2!Eﶓ^J{JCbU&'+!} iꖧ_{aMP:W4%e$&$c@@OD.6,(|y.Kl_VˬCER$vzMHέ ,LHmO'>u@W,s"<]Xϭzv{ѭ(:Fw\X|U)GnV#c2݄/!l;EDc@ӎ*.G>$ߥ@?G@}wM.MCٯ9(R@6uslsz~BQ?$W: zbt(@ :}^:FX^]~~N9Xk^m܆,^-=vr⵳?j>5sMuo˚9a;O@yfH{Xۢk -^_X:[Ͻ8vtygVC.Ubvܗ\OtFJ.+@ _u*~`2FbآSULe4[E:QɣǮ]RQT&~{?썾=xӶW+ʡEN/jJ[@oW; @)a\xuz=bxRv}O=~H]?B1kƯss}[ʏמ8cOZTy6]GՆg<΅ tozYD:tpL&tb{~4ΩCչ'Ygܚbp?: s"/NE◡ }}LJP,8i[/k'f8˪qdaزzT-U2>D[ĵ3J>ѶKcmIX%~n2Kڒؒ)3<~C>S]\/Mcť-l,c$&}e{λt}m:Dme?ޘ@ֽi^_Yje'%[d*aՉF{CеgG&]4EgUU+ٖU};҄#=ps͆:,s[ޖzshL>?B?$%+ٕ޷L%^@ _$V Q-O&#Ω$jK|}} /CEQ * E㼌0Fm닦[*ncTKu!aaL]'$T{]D˂FSD`_%־ h)wMtmߵC5msgb]I |,k usEjU~/jUO[kH.})u*FV~;l~f9JkMկ'=ؕtߎ9_h7D] 41;s@r7,RG&ఓ.KRk}` t}t/e~Z,ɗ*NP[T3MҤ+ *,p @߅Mt#>&SZnZ:G(P%B m^!cl"U tz5#uo'<(}z@_'O2kE5^@ _ɏŌ9NG=!qa_涽DR\!u EW=hz|JBmї*] J;*J0]\|)Q'60sWC&?a ޤ7R\k4klkh@u-;U{m&A=כƴy(CPc3tJ@5KOVMx@oY8>/?#=EOEEz\۪EY>QNc%.&cW.3*ϼojݣZVUz->Emi¾df} j-M=}ݜջd5.0:aAӘaҶU, 7*6GQyS0"ѡcƱl.Ohxܩ{Rǻlfßs>}:ǶSG؇b \:^ؓ@RX@@ _T:sWTkq+ =) cy }He:ٷ­b GϱתRZ?}Cy_My]E@q\4紥>i% @@ɂEnXd9EC-F^ό#:fVNI[_*bDM-猿OK}6rxL9lxaRVJ/ؾ9Y9TrH,d׊]c-4/#]lMV.j+bFʋD >UŔ[޸ blrQE,WŠH8q$egiꥪ\YVLU]Ad'uY#^J6u6k{"؆}uaiU9Y_(Ft%ϕ6, e J)ڻօCեz@L(O\[76cq) بdYGߓQ:6 TQ1bi}5<%-D|cS>( BM;^)c'nM*qՉ6k`u@ _!mQU; i$ Ţ:CX@WK{oA,R7-#>˱@W?%x6VP tGT싂?k1CUE^xSE&9= WRqc B@W*~˥]oRr @@\̗lX6;:l<"-}y5(b*pk ǐUX1VU//#E&R@4neu8~q[c9Ƴmĺƭ}{l u0z'R"d^zMT9gbYSu@+Œ t@ _[$zw|'os8<|!YS*) oXIԊp7UG9Dk_XjCǐ-btKଅs>MZN㷛Qtnq$:Ix/DS!!A/E[}A7Y$r׭W9>r ,~W3c1>gV d,"*) /#eU-CEF%P||e(V,-DwY\Jlō"q"R;寕).Qdϩ$ˮL}Mnש ,hP@ XIwQ5~;{~q@OߡR`)u~ސ@$zD=$ы޶(:f>qBh~Fk'a\*4?儱~{k'W}XtfUzO}/#*XX>uNZ-F&i\hm4lY\.s}Đ@5: S76S1hvU{.OĿ?uU܉$ (jE $BYqz_%QEz 2oѹDMfs6(VRѶ1-tM$LpwO\\'k_16yl` EWUԧ@ѐ(>MNZ*6cj<'k|;_6>qVrW]^vJت!T ݃%_,~zc}XA)P*~'cӤpd'<; ڑP-S>T\H_n+N+*'xPBIsh%Qel"6᤾& ^SYyE'?ZĐ@W2a@qRAR{rӵhBO"tOlTu՟fz"ڝkVDutSU}')HT; 'NU)VCC>◿)*o|,4'SY:1s`D$V]H\)y$* 7Erht $.*8ԗr3$Ї"Q>qmR+ť$I̐@ss5)CvHtRQԿ.r"eXuQOz:q_ݣ-^¾]RJ+"GЋX).zuY(E}B3A/ڹ!kV~@Ctr0MmDz&M$r)lJ oxR_՗ 5%;9ű%vsm']Qxkj˷vlR1 \WkscI*ޮ C>v-UO_4^,oUOKhWv&}l*[p49t*:T=4yݶH_RzOA/tC~A\=C@ xD|N$QHk:|&N} ʛg<t: o k%GVr#Ō+ 1-pѷMVcى'LŶX4 @:} ;G~U07)j VKqi mStY}L'X}&/SHg6Ѥg} Шª"O˪ ^׷Dy[Iu>C]UVw=&!6t: ߝ@!"7$~,OGUdybϲg@zexQK液xcHKB2,pTrET~!N=Dq@o*VM4|@?zI@ UģE=cr,,sM`*eB7Eє$i',EFS] t=,nJVKU@.CO4T!).[YxoW4S]b~O۟!5Mg"{/c: Dۋcۜ>2q*>:#ץO6׏{:tgO i8@ @@ëxpլ!)ă{,ʟ]^1'/ZzV@@+t9CtVEч9y֗N1Z {.;򜏯/NٗzFb[SZ<^Wt:vo[1jsEFUm1kN)6Rjm5IxOWm{Gǃs,wѶ΄2%PRڊM 2 +Cmzݺ@OQ_m Kѧ|~HxUis-Tx}Qi~~ъqJ*EuXkNZZF۪:C'WD =Ogh+xJoV]ys*֞B&}NP1.%/E3sս?%{0ؖG-'Yt@#zjDt6Eg t~jivCu,mԞm'S_/cgtxN.Q ?XhA B˧f8TMu}O:tx}77j1E>YĢl -bnm`meZ,bGl"D"o֮lF}j3kF(~T5޽m|vV~mST6բo,U}y>9O:@D%zv&VUKYmMi"ݶbzX ^fC9q{ZvUǎ1 ܦx~t>a},ڗ|*X(M>h|>ӯHsM7豄@z`!]^ wZ N[Uؽ"E=#+* aY=WDtE@WTTIܿu3i#mrQ뉆17E@ bEz6hPk&&c>.L8HM䄛O!HǨ=ugi"9dHV\n"/'5i2Qc*WzO 4CQүW@@kDoUDb,/aEplk%MǶ$`8ͥꔥ]JJTk G٧2uL7};!㙈sb!uߦT? ۦ{[=t:BҲ_!la\wr@G"ߏ#] ib Yt@#@ upEtZmNrr_ڇo4SsdϸfԯS ^k7s좫Xָ '}ᔘm)3ՠLcZF=ȭEṊ~)}V5 O'(@:\tbsU2U< #պF K"@CdU猅~-& t_EzdIh+t*:_STUO*jg"h菞zsz$궊Qo5kWy_}kuo%7޶"xhkqkm5Rh}[w_kt@(~p?e+>7PۄhTEP>mgXn!l>6ňt,iC{qX3޷Ŏ/˱(EzsDz=p/tM4N*%1cH%*Iq9 tUKUa(MBTX⸪ªIXVbsҳk ml%kt@n_17夸(,4U4"9->&K{/|sIK);l,ñI #M/#Ն"8抬iBQ .Lv5<@:).X270sjTi(]em=F\R\ls&0ՇX3o}]A׹ʝD$- eԷ;7ťO׬oĊ}ݮ72Gk,u@',<(c[9]X{H]sI# k"HOKMU41 =GēDJRtE^/;))=ErM 4( GZ?rDSEAWt*~:W=cB>uʩ"l>:'&Uir{&;}OKK67"1q8<_x(b|$DXG㵉bkt@#M%-L"et96oݎt SZ [gbBt t@#Ì8q /8lםʨ)Y@3ؖlAVG7~r|Em75?:`H,; 9i4""G{1#ucR&TeUVmjOmeEZC^-zZ]wXϙLٳrmAţIE@ ugwQU!9C(jPԅ $ ݂Hvž-p9,fc"["_ǖM@# '&kTj * t]XU7޲C[eaw=[\Vr$'X~TANCvޱ5NJt:DU\tsJ˺1Y0=V7uYV$:7ev~WLPJ)>U}~:em՘#?sws]lz Bq?i+qL"b?',>&Э``KFEMU&M+}J۸'|Bw:J:)n,~K..\Sti4N:HHGeKz@O ]9ⱂrA.~nX+MGJjS6[َј8 z몱]yᡱ &.SOmo[Uwʏ_7F):I~Ϸ#R\oݎ̽v@W[&TzO+r:'e$?a=n.WF"m61jT2Ez/`Vퟄ:+k/Nb&# \ni&$ ,A;C:w($qI|>t:TQTAWF;4mU#*J8mQ~_v%QJtM~swo}"DZʪUZKTVgݵJCUM5sZpnj>9PZi'zhTz:p9NXbz3AY ɁFA]2Z>:^=}6|I`D0*/9_F?/e7Җ)tx;QvVG_ P*E t@ 夯cZ8"wW~ U%q}>t: ,ݤ8"&-G{*7U|9Mq+ ƑuiA)+b抢CYFEM ^t Šcv]˽TTHqS{&ڼ瓒T3]l Ft:av.K!y@7t ¦{QU(Jr)K'c}%<8^.[?s=IyߪBB&坞szp_ޢ6n8@ oE-:"0-UȄp%ќ6]+cN y;Z'}PN`V7ODGxNxǻKQtxk#)mc,(%x"C]%\mSe(>G<ҧWfb5NM Mjnnn~h*JmTsX9 W[Z ^x݈´>٦̫ՂtGYHQtʕ1P-@ @G?4 Y5w"]œ0\0rm<Ǭ6Jw[|DvZGZ9b'X=Rn^Èbm?Bh\: eE$ ޤ@ K{[7$E6Msnrm#F{1&Q$7l\HwBd<^U$mօuۻa_:]GJ?%և:DʵoڶW{B`OBƜ]&ǃdk>C.M n=",\2Ǔ_Mf?Ҿn+Fϵ/:& " u\ϭ#љG"Y%RK?wiWn#1oĸ__*L#s]Jqd@xxqIKBE|VD˔m,bGײ@xS}_"&]؞+}U|*Wv> tbω6Mm#Er$s ϲYz<{)*-!зV7夠ЖN&@yjk2Wui*T. 6npv.sJG)+$d-f՜]wz'e8w&F1Ь')M[>Ps,/}-&Kxҭ9zƧJ%UЂC\Z{{C㴋?F|󺯚EYX7[$:ga`akt؉bum1 4-_3M:my:Vf:K"@:t: @@@t@t@ K;;+ccV@: ޏ@*"@:..@@ @:|r_.fNuu龫6iq|ڷ 9p /]-}l@b>Š'Di[ҎSUƞ9aYBkƢoc @@h{jެ P@__I* j zǶ׾Q8-' xU[n&F&~; pmgb)uٜy~M;mz1T˷1ѭC[6i6iH}9DJ&R[ t&(M&w1nl+(K/1Qk~ovK"ڵ%hM]\,[n-'c㫉9isYVǶ=]7:D__%).!l]X7j.f5s:}ۮȹqAh ^ yVD.G?\cpnwzlK('| oM)6Deh\;@ ;ukQ5#Y(">Ŧ{oO*EkvЯr!]]9nje!I&@ ߴ@V9ٻ;[.pq @XR5RH/5V'J$"[F2. @'Ur4T%='٦{dY߷Q;۱MS4}ʫz&.;~r9-wNiz+*_V[XHCzyJԛF589i#]/&k} Ko[ErgmrXοwmRa10 x!=bI\usM`IX):>!mUOGib?#ҨD")|`Si mM rC{ky,-oYSOQ4rB1:5qrfkgꪮc߱dHZSQ~l /Xlj`F!{+^Y`zqΥs: qqymx(r[d9m8@G,맪6O~N8[@Gݎ:Xw5Qf1t-d.!澂Mʯ P:i[I[}kjlyeaӕH:pN*eŜ0 ][cMxHGj -q.t˾XG~T>ҢD9hڷ!&X*wNlZ_=N5t@Q\(h/V%,*,%!.m>6ʱ{{q$W(}˥%з"jvSB,L$A5uw9JiwњY#е̇zQOT#@?e,w<ف*cIt j.&ֽ!Iq3PMEoŋkDRr @xJPDErSi}>V-R|rӮơYع^6/-f@9X)%ChYiR<6)~ߴ=VU<$Est@i,wӜRu׌pLݓ79ZTj)~v6v G?xU ([})phm*2U@ۮڿ)`ui?F>Yg]LKJ]-[sZ˼`Q/~U* ߉,H&SLFq[p2gK}YU5=13O/uzAmn7Jhp֞*'>[cmv.([5ɭutuSJ}.+an෶6IOhQCNﮛJ:&cd_{Qt@}x^)ַe{LyD> 6=Bz9)UD7@s?s4DX7O GLnָU5K{𾭈Z4-΋EFma@ŶZfO0pIBs}=@G"@=@ϋ OKQU1+ׇ7mNv=gn9D|@JE9!_4X>r2&5{T2q,YT'MmBt] Ͷ;Qkϓ3qŴM:YI[uqn}U}@Wu΍;LE؍t: ߰͢ԗt.L̿rB -xfrTG|&ʞ^3mV͂JOr$O4փޯlǸkQU!d^W-% ?T\,Xt@;)..(c̸ySX-P͔whY1Tީ"hV/&QIyO+}{OMTF}>@G}@jn\lRssѠEG^*Ч ַJ6&r$d-ݦd9Wܥ" )%gߦ=jԆgGx;ׇ^”&Dt@b"ܪ5&ЕҢc*?E/Eu:-lIbWU9z iTP5K 6K -N&U6@D_;GeU}jhp/ɽd7FPR;χ,dŤsj*vHé-ҚTgCo:g%yo0@#NF=Ed_:t@Pqk[y!Q_,@:}6Km8oooa9j{mrVysc]Y@^gWG6ʗEњR9憣HiB䉾%m["p-~|k>RV* I1+DFI>Ǣ@s*sFA4M}YsFU8vi)hPV!ɃO _ Ϯu@R.EMKx41l"6VMTU@ *maoJߛmzQ6EUd!=V:U^Mp=c۶.%t+h$Ffmh"`Cj@ S\3M J(vAS<@0JGvVO t+hJ@86aU=C:xSGTYTm)/jh|J﷏W*h4Qܩdn;%/*:-bwJ(uٍ)0}%E%Ut,_F0|u:n&l[GU[gILZBEtD бYg&S@ @@ FBP`ixNVNG~k> L֢ŵ;hfDH/CǶ8j|O%;Ȼ\rs+@71(j&ʛ;Vݴ(PzW1x[?D?㇥l(6M8 t vSߗw#m!\.y D;t@;e m<&DHQ&nc:Y}@7"D2}sz߬4@][~R[oU"nV䖞A_BeKUU&j\ t@KV%ci/|r: ϽuTYAC?08c@xGR^-F+,6Kߪ{BofmFՆy( 1>/喯sgg+Sp }72}h]|(&sxYO o^Y|y П]HK5jQܚ@]K]btBns6e:I]hP_-;k&e56Mޯjs.mokx ~L/9:3xCN|pGE&DǎsH|T~Z5(9nS"Pz,M*'8 tcqwm(\LtKTw}7Jޤmlz x0ֱS[wCrJC ew~t/{㓀TE=1v9F?@WI$w v6K:Y-:e[.5a' l3F/e:GfӇ5oNMT4#N? IX5kWĶnja.1wںK,=/rh-^{M$41DKȃ;%qvч.˪}QOᵯKU͓0^-(ݛDrrPQa/P)+"UQGK2rO(tí7d],u nfܡٛfvo? t mNֺ!/lrQL)A JX>$׍f̚scrl&~g:^i3@%f1ڷbTnz;%~u#t&,}](m$S̮(PƾMGzOI\_kEH ӂ} C.߇)Z6&)T<]67{ȶbt\BO"Q?.NOݛtM~_:T@s'8kkqX>Ҭh]3eϢ 8-tIK60\ q}Z'Еc3U=6Pߥ},??GIM#E;M_:?fW"7Lۣ4cEaIx)KD7=f7 (%N!Kn㭗c_rb@v("t_;\k庝CVI4^O @,е E.9Ǟʮt: \Dm-S};^!g+:VsR}[~cKS^t*RI*}*8X eP4"Ӊ{b5.ZYa@}b 衾KCtrZɎyp):D/>E6Tk*k8Qt" tY)rB9sm OEejf~>&M@/rh~4_U=&Ҷ^{eK.cS腘Th}A%Qx= (e{,}k=ڷOi욶o;'A1'~Xrs~"g8D$J%Qx}i{=2,WweZ2YClNj(rMJSk,@_w֞eG*& y5QDé$J%Q*;n5Ep@W W:J_\q^ăcߥ%($Wnv4DfMB} ]W cEc$J%Q*6 JqiRIJT@#~P*J @?^JyT:TJxm8/mS6wf%mi VxuwqqJzP' uS1:5VY4~h}juKzֿ띘z( "qAZ4P8x!T>eԑ7*ƔnnC H=F-sc\UA_fq?^8/G)I|&(^\l/28gci<]e5ލ/ytFS52JCsi ;Lae1D)Ë9Ѷ*(\iCug_}}v .܍OLt~fbaKG4t>.w>=zT0~/SFX*n .^Q^mMڇ]Sw../Qo@^FիxY?ؾ:‹ħvT?˓|'R!!.F5eR\-sSH-NJծ¦E.W 6 @CעʝJ3 XHv5U)d] tsKjnKԏIk6(l $,f/fV}ݎYe"nS\fTn8^x4Vk/@fۍ{$CcyzS5 treוJ5P^,JqA*2'Хzk,keC>aj,xOɱ5I@q]-cO,&2~GK4?b`u~?ȗaG~e}}uޟ mޓ@w\#_=  GhD t_R4q3.4K7=rޟ_?rW<."Ew1N}*y>&.-l|X4>A G~\,bC]8#4"xg:ﯻPVqlc|},wGǑ f#ïcc_|} G;M<2.,ޅ]1"(.M ot'n\GUކEjG݅C͏*Eo? }0&G{ W?y}O &K=t @Vݺ&??i>?>|e\1|[)ou}h y:k͞~_dg 'wxDkڏ׸t)OY G[z$Z7<o--3]+ӀxʇE|e_'|"ϑ*#~K uwASBjILq#@_ⓔOM"?p0Cㇻp"O 1?}{eAT@u[{"?&^*ht+|/4kp#&~]9Om|E}B7h{dg 3\ ItS6 O"~|>9 Yjo}@_X1u4p?6įw KyWh;}#޼@)M'_ HOL|s| x@?3d 3"Ɛ;J}H>@zM}D @jzJGg\a>3ɾU4=sc]׮$jW:w_l?ʫFlQ+8qɡwrwc}B>}?Ë|A8 P(B{?>έ;|!=旸}vכXG޿~;|+ЯYI#"\~ȷP%'H.п…wGW]-J]p~*X~[Pyl[&oc*'mr >!PI24iޟ}kn׮$GH/]?V69D< IO//xO*Rh;\*2W ۯ q\Z7_ 9 kWJ?-&oc}N@L`^軻@s&7=IY][Ў_@o7YT'W6Dޏ@J3uA#S|Mqj6=8hU5m'*_/ _Ƥ&'j<}B}sBzqއ u{JC>SĿJoFZi7 }H8JoTX/N t: @:t@ @:@@t: @@thߤmoIENDB`python-patch-ng-1.17.4/doc/unified_diff_svn.svg000066400000000000000000002705151363443050500214300ustar00rootroot00000000000000 image/svg+xml Unified Diff/Patch Format (Subversion) comments are ignored the first file thatexists is used may contain severalhunks for each file -line_from,total_before+line_after,total_after --- filename \t comment line ends may differ for the format like-line_from +line_aftertotal_xxx = 1 "\ No newline at end of file" marker is used iffile ends without newline http://en.wikipedia.org/wiki/Diff#Unified_format http://techtonik.rainforce.org Index: src/plugins/contrib/devpak_plugin/updatedlg.cpp===================================================================--- src/plugins/contrib/devpak_plugin/updatedlg.cpp (revision 5106)+++ src/plugins/contrib/devpak_plugin/updatedlg.cpp (working copy)@@ -94,11 +94,13 @@ lst->InsertColumn(1, _("Version")); lst->InsertColumn(2, _("Installed")); lst->InsertColumn(3, _("Size"), wxLIST_FORMAT_RIGHT);+ lst->InsertColumn(4, _("Rev")); - lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3) - 2); // 1st column takes all remaining space+ lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3 + 40) - 6 ); // 1st column takes all remaining space lst->SetColumnWidth(1, 64); lst->SetColumnWidth(2, 64); lst->SetColumnWidth(3, 64);+ lst->SetColumnWidth(4, 40); } void UpdateDlg::AddRecordToList(UpdateRec* rec)@@ -111,8 +113,20 @@ lst->SetItem(idx, 1, rec->version); lst->SetItem(idx, 2, rec->installed_version); lst->SetItem(idx, 3, rec->size);+ lst->SetItem(idx, 4, rec->revision); } +wxString UpdateDlg::GetListColumnText(int idx, int col) {+ wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl);+ int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx;+ wxListItem info;+ info.SetId(index);+ info.SetColumn(col);+ info.SetMask(wxLIST_MASK_TEXT);+ lst->GetItem(info);+ return info.GetText();+}+ void UpdateDlg::SetListColumnText(int idx, int col, const wxString& text) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl);@@ -393,7 +407,9 @@ if (index == -1) return 0; wxString title = lst->GetItemText(index);- return FindRecByTitle(title, m_Recs, m_RecsCount);+ wxString version = GetListColumnText(index, 1);+ wxString revision = GetListColumnText(index, 4);+ return FindRec(title, version, revision, m_Recs, m_RecsCount); } void UpdateDlg::DownloadFile(bool dontInstall)Index: src/plugins/contrib/devpak_plugin/manifest.xml===================================================================--- src/plugins/contrib/devpak_plugin/manifest.xml (revision 5106)+++ src/plugins/contrib/devpak_plugin/manifest.xml (working copy)@@ -2,18 +2,19 @@ <CodeBlocks_plugin_manifest_file> <SdkVersion major="1" minor="10" release="0" /> <Plugin name="DevPakUpdater">- <Value title="Dev-C++ DevPak updater/installer" />- <Value version="0.1" />+ <Value title="DevPak updater/installer" />+ <Value version="0.2" /> <Value description="Installs selected DevPaks from the Internet" /> <Value author="Yiannis Mandravellos" /> <Value authorEmail="info@codeblocks.org" /> <Value authorWebsite="http://www.codeblocks.org/" /> <Value thanksTo="Dev-C++ community.- Julian R Seward for libbzip2.- libbzip2 copyright notice:- bzip2 and associated library libbzip2, are- copyright (C) 1996-2000 Julian R Seward.- All rights reserved." />+ Julian R Seward for libbzip2.++ libbzip2 copyright notice:+ bzip2 and associated library libbzip2, are+ copyright (C) 1996-2000 Julian R Seward.+ All rights reserved." /> <Value license="GPL" /> </Plugin>-</CodeBlocks_plugin_manifest_file>+</CodeBlocks_plugin_manifest_file>\ No newline at end of file line numbers start from 1 python-patch-ng-1.17.4/example/000077500000000000000000000000001363443050500162625ustar00rootroot00000000000000python-patch-ng-1.17.4/example/example.py000066400000000000000000000014741363443050500202750ustar00rootroot00000000000000import os import logging from patch import fromfile, fromstring class PatchLogHandler(logging.Handler): def __init__(self): logging.Handler.__init__(self, logging.DEBUG) def emit(self, record): logstr = self.format(record) print logstr patchlog = logging.getLogger("patch") patchlog.handlers = [] patchlog.addHandler(PatchLogHandler()) patch = fromstring("""--- /dev/null +++ b/newfile @@ -0,0 +0,3 @@ +New file1 +New file2 +New file3 """) patch.apply(root=os.getcwd(), strip=0) with open("newfile", "rb") as f: newfile = f.read() assert "New file1\nNew file2\nNew file3\n" == newfile patch = fromstring("""--- a/newfile +++ /dev/null @@ -0,3 +0,0 @@ -New file1 -New file2 -New file3 """) result = patch.apply(root=os.getcwd(), strip=0) assert os.path.exists("newfile") is Falsepython-patch-ng-1.17.4/patch_ng.py000077500000000000000000001276011363443050500167760ustar00rootroot00000000000000#!/usr/bin/env python """ Patch utility to apply unified diffs Brute-force line-by-line non-recursive parsing Copyright (c) 2008-2016 anatoly techtonik Available under the terms of MIT license --- The MIT License (MIT) Copyright (c) 2019 JFrog LTD Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ from __future__ import print_function __author__ = "Conan.io " __version__ = "1.17.4" __license__ = "MIT" __url__ = "https://github.com/conan-io/python-patch" import copy import logging import re import tempfile import codecs # cStringIO doesn't support unicode in 2.5 try: from StringIO import StringIO except ImportError: from io import BytesIO as StringIO # python 3 try: import urllib2 as urllib_request except ImportError: import urllib.request as urllib_request from os.path import exists, isfile, abspath import os import posixpath import shutil import sys import stat PY3K = sys.version_info >= (3, 0) # PEP 3114 if not PY3K: compat_next = lambda gen: gen.next() else: compat_next = lambda gen: gen.__next__() def tostr(b): """ Python 3 bytes encoder. Used to print filename in diffstat output. Assumes that filenames are in utf-8. """ if not PY3K: return b # [ ] figure out how to print non-utf-8 filenames without # information loss return b.decode('utf-8') #------------------------------------------------ # Logging is controlled by logger named after the # module name (e.g. 'patch' for patch_ng.py module) logger = logging.getLogger("patch_ng") debug = logger.debug info = logger.info warning = logger.warning error = logger.error class NullHandler(logging.Handler): """ Copied from Python 2.7 to avoid getting `No handlers could be found for logger "patch"` http://bugs.python.org/issue16539 """ def handle(self, record): pass def emit(self, record): pass def createLock(self): self.lock = None streamhandler = logging.StreamHandler() # initialize logger itself logger.addHandler(NullHandler()) debugmode = False def setdebug(): global debugmode, streamhandler debugmode = True loglevel = logging.DEBUG logformat = "%(levelname)8s %(message)s" logger.setLevel(loglevel) if streamhandler not in logger.handlers: # when used as a library, streamhandler is not added # by default logger.addHandler(streamhandler) streamhandler.setFormatter(logging.Formatter(logformat)) #------------------------------------------------ # Constants for Patch/PatchSet types DIFF = PLAIN = "plain" GIT = "git" HG = MERCURIAL = "mercurial" SVN = SUBVERSION = "svn" # mixed type is only actual when PatchSet contains # Patches of different type MIXED = MIXED = "mixed" #------------------------------------------------ # Helpers (these could come with Python stdlib) # x...() function are used to work with paths in # cross-platform manner - all paths use forward # slashes even on Windows. def xisabs(filename): """ Cross-platform version of `os.path.isabs()` Returns True if `filename` is absolute on Linux, OS X or Windows. """ if filename.startswith(b'/'): # Linux/Unix return True elif filename.startswith(b'\\'): # Windows return True elif re.match(b'\\w:[\\\\/]', filename): # Windows return True return False def xnormpath(path): """ Cross-platform version of os.path.normpath """ # replace escapes and Windows slashes normalized = posixpath.normpath(path).replace(b'\\', b'/') # fold the result return posixpath.normpath(normalized) def xstrip(filename): """ Make relative path out of absolute by stripping prefixes used on Linux, OS X and Windows. This function is critical for security. """ while xisabs(filename): # strip windows drive with all slashes if re.match(b'\\w:[\\\\/]', filename): filename = re.sub(b'^\\w+:[\\\\/]+', b'', filename) # strip all slashes elif re.match(b'[\\\\/]', filename): filename = re.sub(b'^[\\\\/]+', b'', filename) return filename def safe_unlink(filepath): os.chmod(filepath, stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH) os.unlink(filepath) #----------------------------------------------- # Main API functions def fromfile(filename): """ Parse patch file. If successful, returns PatchSet() object. Otherwise returns False. """ patchset = PatchSet() debug("reading %s" % filename) fp = open(filename, "rb") res = patchset.parse(fp) fp.close() if res == True: return patchset return False def fromstring(s): """ Parse text string and return PatchSet() object (or False if parsing fails) """ ps = PatchSet( StringIO(s) ) if ps.errors == 0: return ps return False def fromurl(url): """ Parse patch from an URL, return False if an error occured. Note that this also can throw urlopen() exceptions. """ ps = PatchSet( urllib_request.urlopen(url) ) if ps.errors == 0: return ps return False # --- Utility functions --- # [ ] reuse more universal pathsplit() def pathstrip(path, n): """ Strip n leading components from the given path """ pathlist = [path] while os.path.dirname(pathlist[0]) != b'': pathlist[0:1] = os.path.split(pathlist[0]) return b'/'.join(pathlist[n:]) # --- /Utility function --- def decode_text(text): encodings = {codecs.BOM_UTF8: "utf_8_sig", codecs.BOM_UTF16_BE: "utf_16_be", codecs.BOM_UTF16_LE: "utf_16_le", codecs.BOM_UTF32_BE: "utf_32_be", codecs.BOM_UTF32_LE: "utf_32_le", b'\x2b\x2f\x76\x38': "utf_7", b'\x2b\x2f\x76\x39': "utf_7", b'\x2b\x2f\x76\x2b': "utf_7", b'\x2b\x2f\x76\x2f': "utf_7", b'\x2b\x2f\x76\x38\x2d': "utf_7"} for bom in sorted(encodings, key=len, reverse=True): if text.startswith(bom): try: return text[len(bom):].decode(encodings[bom]) except UnicodeDecodeError: continue decoders = ["utf-8", "Windows-1252"] for decoder in decoders: try: return text.decode(decoder) except UnicodeDecodeError: continue logger.warning("can't decode %s" % str(text)) return text.decode("utf-8", "ignore") # Ignore not compatible characters def to_file_bytes(content): if PY3K: if not isinstance(content, bytes): content = bytes(content, "utf-8") elif isinstance(content, unicode): content = content.encode("utf-8") return content def load(path, binary=False): """ Loads a file content """ with open(path, 'rb') as handle: tmp = handle.read() return tmp if binary else decode_text(tmp) def save(path, content, only_if_modified=False): """ Saves a file with given content Params: path: path to write file to content: contents to save in the file only_if_modified: file won't be modified if the content hasn't changed """ try: os.makedirs(os.path.dirname(path)) except Exception: pass new_content = to_file_bytes(content) if only_if_modified and os.path.exists(path): old_content = load(path, binary=True) if old_content == new_content: return with open(path, "wb") as handle: handle.write(new_content) class Hunk(object): """ Parsed hunk data container (hunk starts with @@ -R +R @@) """ def __init__(self): self.startsrc=None #: line count starts with 1 self.linessrc=None self.starttgt=None self.linestgt=None self.invalid=False self.desc='' self.text=[] class Patch(object): """ Patch for a single file. If used as an iterable, returns hunks. """ def __init__(self): self.source = None self.target = None self.hunks = [] self.hunkends = [] self.header = [] self.type = None def __iter__(self): for h in self.hunks: yield h class PatchSet(object): """ PatchSet is a patch parser and container. When used as an iterable, returns patches. """ def __init__(self, stream=None): # --- API accessible fields --- # name of the PatchSet (filename or ...) self.name = None # patch set type - one of constants self.type = None # list of Patch objects self.items = [] self.errors = 0 # fatal parsing errors self.warnings = 0 # non-critical warnings # --- /API --- if stream: self.parse(stream) def __len__(self): return len(self.items) def __iter__(self): for i in self.items: yield i def parse(self, stream): """ parse unified diff return True on success """ lineends = dict(lf=0, crlf=0, cr=0) nexthunkno = 0 #: even if index starts with 0 user messages number hunks from 1 p = None hunk = None # hunkactual variable is used to calculate hunk lines for comparison hunkactual = dict(linessrc=None, linestgt=None) class wrapumerate(enumerate): """Enumerate wrapper that uses boolean end of stream status instead of StopIteration exception, and properties to access line information. """ def __init__(self, *args, **kwargs): # we don't call parent, it is magically created by __new__ method self._exhausted = False self._lineno = False # after end of stream equal to the num of lines self._line = False # will be reset to False after end of stream def next(self): """Try to read the next line and return True if it is available, False if end of stream is reached.""" if self._exhausted: return False try: self._lineno, self._line = compat_next(super(wrapumerate, self)) except StopIteration: self._exhausted = True self._line = False return False return True @property def is_empty(self): return self._exhausted @property def line(self): return self._line @property def lineno(self): return self._lineno # define states (possible file regions) that direct parse flow headscan = True # start with scanning header filenames = False # lines starting with --- and +++ hunkhead = False # @@ -R +R @@ sequence hunkbody = False # hunkskip = False # skipping invalid hunk mode hunkparsed = False # state after successfully parsed hunk # regexp to match start of hunk, used groups - 1,3,4,6 re_hunk_start = re.compile(b"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@") self.errors = 0 # temp buffers for header and filenames info header = [] srcname = None tgtname = None # start of main cycle # each parsing block already has line available in fe.line fe = wrapumerate(stream) while fe.next(): # -- deciders: these only switch state to decide who should process # -- line fetched at the start of this cycle if hunkparsed: hunkparsed = False if re_hunk_start.match(fe.line): hunkhead = True elif fe.line.startswith(b"--- "): filenames = True else: headscan = True # -- ------------------------------------ # read out header if headscan: while not fe.is_empty and not fe.line.startswith(b"--- "): header.append(fe.line) fe.next() if fe.is_empty: if p is None: debug("no patch data found") # error is shown later self.errors += 1 else: info("%d unparsed bytes left at the end of stream" % len(b''.join(header))) self.warnings += 1 # TODO check for \No new line at the end.. # TODO test for unparsed bytes # otherwise error += 1 # this is actually a loop exit continue headscan = False # switch to filenames state filenames = True line = fe.line lineno = fe.lineno # hunkskip and hunkbody code skipped until definition of hunkhead is parsed if hunkbody: # [x] treat empty lines inside hunks as containing single space # (this happens when diff is saved by copy/pasting to editor # that strips trailing whitespace) if line.strip(b"\r\n") == b"": debug("expanding empty line in a middle of hunk body") self.warnings += 1 line = b' ' + line # process line first if re.match(b"^[- \\+\\\\]", line): # gather stats about line endings if line.endswith(b"\r\n"): p.hunkends["crlf"] += 1 elif line.endswith(b"\n"): p.hunkends["lf"] += 1 elif line.endswith(b"\r"): p.hunkends["cr"] += 1 if line.startswith(b"-"): hunkactual["linessrc"] += 1 elif line.startswith(b"+"): hunkactual["linestgt"] += 1 elif not line.startswith(b"\\"): hunkactual["linessrc"] += 1 hunkactual["linestgt"] += 1 hunk.text.append(line) # todo: handle \ No newline cases else: warning("invalid hunk no.%d at %d for target file %s" % (nexthunkno, lineno+1, p.target)) # add hunk status node hunk.invalid = True p.hunks.append(hunk) self.errors += 1 # switch to hunkskip state hunkbody = False hunkskip = True # check exit conditions if hunkactual["linessrc"] > hunk.linessrc or hunkactual["linestgt"] > hunk.linestgt: warning("extra lines for hunk no.%d at %d for target %s" % (nexthunkno, lineno+1, p.target)) # add hunk status node hunk.invalid = True p.hunks.append(hunk) self.errors += 1 # switch to hunkskip state hunkbody = False hunkskip = True elif hunk.linessrc == hunkactual["linessrc"] and hunk.linestgt == hunkactual["linestgt"]: # hunk parsed successfully p.hunks.append(hunk) # switch to hunkparsed state hunkbody = False hunkparsed = True # detect mixed window/unix line ends ends = p.hunkends if ((ends["cr"]!=0) + (ends["crlf"]!=0) + (ends["lf"]!=0)) > 1: warning("inconsistent line ends in patch hunks for %s" % p.source) self.warnings += 1 if debugmode: debuglines = dict(ends) debuglines.update(file=p.target, hunk=nexthunkno) debug("crlf: %(crlf)d lf: %(lf)d cr: %(cr)d\t - file: %(file)s hunk: %(hunk)d" % debuglines) # fetch next line continue if hunkskip: if re_hunk_start.match(line): # switch to hunkhead state hunkskip = False hunkhead = True elif line.startswith(b"--- "): # switch to filenames state hunkskip = False filenames = True if debugmode and len(self.items) > 0: debug("- %2d hunks for %s" % (len(p.hunks), p.source)) if filenames: if line.startswith(b"--- "): if srcname != None: # XXX testcase warning("skipping false patch for %s" % srcname) srcname = None # XXX header += srcname # double source filename line is encountered # attempt to restart from this second line # Files dated at Unix epoch don't exist, e.g.: # '1970-01-01 01:00:00.000000000 +0100' # They include timezone offsets. # .. which can be parsed (if we remove the nanoseconds) # .. by strptime() with: # '%Y-%m-%d %H:%M:%S %z' # .. but unfortunately this relies on the OSes libc # strptime function and %z support is patchy, so we drop # everything from the . onwards and group the year and time # separately. re_filename_date_time = b"^--- ([^\t]+)(?:\s([0-9-]+)\s([0-9:]+)|.*)" match = re.match(re_filename_date_time, line) # todo: support spaces in filenames if match: srcname = match.group(1).strip() date = match.group(2) time = match.group(3) if (date == b'1970-01-01' or date == b'1969-12-31') and time.split(b':',1)[1] == b'00:00': srcname = b'/dev/null' else: warning("skipping invalid filename at line %d" % (lineno+1)) self.errors += 1 # XXX p.header += line # switch back to headscan state filenames = False headscan = True elif not line.startswith(b"+++ "): if srcname != None: warning("skipping invalid patch with no target for %s" % srcname) self.errors += 1 srcname = None # XXX header += srcname # XXX header += line else: # this should be unreachable warning("skipping invalid target patch") filenames = False headscan = True else: if tgtname != None: # XXX seems to be a dead branch warning("skipping invalid patch - double target at line %d" % (lineno+1)) self.errors += 1 srcname = None tgtname = None # XXX header += srcname # XXX header += tgtname # XXX header += line # double target filename line is encountered # switch back to headscan state filenames = False headscan = True else: re_filename_date_time = b"^\+\+\+ ([^\t]+)(?:\s([0-9-]+)\s([0-9:]+)|.*)" match = re.match(re_filename_date_time, line) if not match: warning("skipping invalid patch - no target filename at line %d" % (lineno+1)) self.errors += 1 srcname = None # switch back to headscan state filenames = False headscan = True else: tgtname = match.group(1).strip() date = match.group(2) time = match.group(3) if (date == b'1970-01-01' or date == b'1969-12-31') and time.split(b':',1)[1] == b'00:00': tgtname = b'/dev/null' if p: # for the first run p is None self.items.append(p) p = Patch() p.source = srcname srcname = None p.target = tgtname tgtname = None p.header = header header = [] # switch to hunkhead state filenames = False hunkhead = True nexthunkno = 0 p.hunkends = lineends.copy() continue if hunkhead: match = re.match(b"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@(.*)", line) if not match: if not p.hunks: warning("skipping invalid patch with no hunks for file %s" % p.source) self.errors += 1 # XXX review switch # switch to headscan state hunkhead = False headscan = True continue else: # TODO review condition case # switch to headscan state hunkhead = False headscan = True else: hunk = Hunk() hunk.startsrc = int(match.group(1)) hunk.linessrc = 1 if match.group(3): hunk.linessrc = int(match.group(3)) hunk.starttgt = int(match.group(4)) hunk.linestgt = 1 if match.group(6): hunk.linestgt = int(match.group(6)) hunk.invalid = False hunk.desc = match.group(7)[1:].rstrip() hunk.text = [] hunkactual["linessrc"] = hunkactual["linestgt"] = 0 # switch to hunkbody state hunkhead = False hunkbody = True nexthunkno += 1 continue # /while fe.next() if p: self.items.append(p) if not hunkparsed: if hunkskip: warning("warning: finished with errors, some hunks may be invalid") elif headscan: if len(self.items) == 0: warning("error: no patch data found!") return False else: # extra data at the end of file pass else: warning("error: patch stream is incomplete!") self.errors += 1 if len(self.items) == 0: return False if debugmode and len(self.items) > 0: debug("- %2d hunks for %s" % (len(p.hunks), p.source)) # XXX fix total hunks calculation debug("total files: %d total hunks: %d" % (len(self.items), sum(len(p.hunks) for p in self.items))) # ---- detect patch and patchset types ---- for idx, p in enumerate(self.items): self.items[idx].type = self._detect_type(p) types = set([p.type for p in self.items]) if len(types) > 1: self.type = MIXED else: self.type = types.pop() # -------- self._normalize_filenames() return (self.errors == 0) def _detect_type(self, p): """ detect and return type for the specified Patch object analyzes header and filenames info NOTE: must be run before filenames are normalized """ # check for SVN # - header starts with Index: # - next line is ===... delimiter # - filename is followed by revision number # TODO add SVN revision if (len(p.header) > 1 and p.header[-2].startswith(b"Index: ") and p.header[-1].startswith(b"="*67)): return SVN # common checks for both HG and GIT DVCS = ((p.source.startswith(b'a/') or p.source == b'/dev/null') and (p.target.startswith(b'b/') or p.target == b'/dev/null')) # GIT type check # - header[-2] is like "diff --git a/oldname b/newname" # - header[-1] is like "index .. " # TODO add git rename diffs and add/remove diffs # add git diff with spaced filename # TODO http://www.kernel.org/pub/software/scm/git/docs/git-diff.html # Git patch header len is 2 min if len(p.header) > 1: # detect the start of diff header - there might be some comments before for idx in reversed(range(len(p.header))): if p.header[idx].startswith(b"diff --git"): break if p.header[idx].startswith(b'diff --git a/'): if (idx+1 < len(p.header) and re.match(b'(?:index \\w{7}..\\w{7} \\d{6}|new file mode \\d*)', p.header[idx+1])): if DVCS: return GIT # HG check # # - for plain HG format header is like "diff -r b2d9961ff1f5 filename" # - for Git-style HG patches it is "diff --git a/oldname b/newname" # - filename starts with a/, b/ or is equal to /dev/null # - exported changesets also contain the header # # HG changeset patch # # User name@example.com # ... # TODO add MQ # TODO add revision info if len(p.header) > 0: if DVCS and re.match(b'diff -r \\w{12} .*', p.header[-1]): return HG if DVCS and p.header[-1].startswith(b'diff --git a/'): if len(p.header) == 1: # native Git patch header len is 2 return HG elif p.header[0].startswith(b'# HG changeset patch'): return HG return PLAIN def _normalize_filenames(self): """ sanitize filenames, normalizing paths, i.e.: 1. strip a/ and b/ prefixes from GIT and HG style patches 2. remove all references to parent directories (with warning) 3. translate any absolute paths to relative (with warning) [x] always use forward slashes to be crossplatform (diff/patch were born as a unix utility after all) return None """ if debugmode: debug("normalize filenames") for i,p in enumerate(self.items): if debugmode: debug(" patch type = %s" % p.type) debug(" source = %s" % p.source) debug(" target = %s" % p.target) if p.type in (HG, GIT): debug("stripping a/ and b/ prefixes") if p.source != b'/dev/null': if not p.source.startswith(b"a/"): warning("invalid source filename") else: p.source = p.source[2:] if p.target != b'/dev/null': if not p.target.startswith(b"b/"): warning("invalid target filename") else: p.target = p.target[2:] p.source = xnormpath(p.source) p.target = xnormpath(p.target) sep = b'/' # sep value can be hardcoded, but it looks nice this way # references to parent are not allowed if p.source.startswith(b".." + sep): warning("error: stripping parent path for source file patch no.%d" % (i+1)) self.warnings += 1 while p.source.startswith(b".." + sep): p.source = p.source.partition(sep)[2] if p.target.startswith(b".." + sep): warning("error: stripping parent path for target file patch no.%d" % (i+1)) self.warnings += 1 while p.target.startswith(b".." + sep): p.target = p.target.partition(sep)[2] # absolute paths are not allowed if (xisabs(p.source) and p.source != b'/dev/null') or \ (xisabs(p.target) and p.target != b'/dev/null'): warning("error: absolute paths are not allowed - file no.%d" % (i+1)) self.warnings += 1 if xisabs(p.source) and p.source != b'/dev/null': warning("stripping absolute path from source name '%s'" % p.source) p.source = xstrip(p.source) if xisabs(p.target) and p.target != b'/dev/null': warning("stripping absolute path from target name '%s'" % p.target) p.target = xstrip(p.target) self.items[i].source = p.source self.items[i].target = p.target def diffstat(self): """ calculate diffstat and return as a string Notes: - original diffstat ouputs target filename - single + or - shouldn't escape histogram """ names = [] insert = [] delete = [] delta = 0 # size change in bytes namelen = 0 maxdiff = 0 # max number of changes for single file # (for histogram width calculation) for patch in self.items: i,d = 0,0 for hunk in patch.hunks: for line in hunk.text: if line.startswith(b'+'): i += 1 delta += len(line)-1 elif line.startswith(b'-'): d += 1 delta -= len(line)-1 names.append(patch.target) insert.append(i) delete.append(d) namelen = max(namelen, len(patch.target)) maxdiff = max(maxdiff, i+d) output = '' statlen = len(str(maxdiff)) # stats column width for i,n in enumerate(names): # %-19s | %-4d %s format = " %-" + str(namelen) + "s | %" + str(statlen) + "s %s\n" hist = '' # -- calculating histogram -- width = len(format % ('', '', '')) histwidth = max(2, 80 - width) if maxdiff < histwidth: hist = "+"*insert[i] + "-"*delete[i] else: iratio = (float(insert[i]) / maxdiff) * histwidth dratio = (float(delete[i]) / maxdiff) * histwidth # make sure every entry gets at least one + or - iwidth = 1 if 0 < iratio < 1 else int(iratio) dwidth = 1 if 0 < dratio < 1 else int(dratio) #print(iratio, dratio, iwidth, dwidth, histwidth) hist = "+"*int(iwidth) + "-"*int(dwidth) # -- /calculating +- histogram -- output += (format % (tostr(names[i]), str(insert[i] + delete[i]), hist)) output += (" %d files changed, %d insertions(+), %d deletions(-), %+d bytes" % (len(names), sum(insert), sum(delete), delta)) return output def findfiles(self, old, new): """ return tuple of source file, target file """ if old == b'/dev/null': handle, abspath = tempfile.mkstemp(suffix='pypatch') abspath = abspath.encode() # The source file must contain a line for the hunk matching to succeed. os.write(handle, b' ') os.close(handle) if not exists(new): handle = open(new, 'wb') handle.close() return abspath, new elif exists(old): return old, old elif exists(new): return new, new elif new == b'/dev/null': return None, None else: # [w] Google Code generates broken patches with its online editor debug("broken patch from Google Code, stripping prefixes..") if old.startswith(b'a/') and new.startswith(b'b/'): old, new = old[2:], new[2:] debug(" %s" % old) debug(" %s" % new) if exists(old): return old, old elif exists(new): return new, new return None, None def _strip_prefix(self, filename): if filename.startswith(b'a/') or filename.startswith(b'b/'): return filename[2:] return filename def decode_clean(self, path, prefix): path = path.decode("utf-8").replace("\\", "/") if path.startswith(prefix): path = path[2:] return path def strip_path(self, path, base_path, strip=0): tokens = path.split("/") if len(tokens) > 1: tokens = tokens[strip:] path = "/".join(tokens) if base_path: path = os.path.join(base_path, path) return path # account for new and deleted files, upstream dep won't fix them def apply(self, strip=0, root=None, fuzz=False): """ Apply parsed patch, optionally stripping leading components from file paths. `root` parameter specifies working dir. :param strip: Strip patch path :param root: Folder to apply the patch :param fuzz: Accept fuzzy patches return True on success """ items = [] for item in self.items: source = self.decode_clean(item.source, "a/") target = self.decode_clean(item.target, "b/") if "dev/null" in source: target = self.strip_path(target, root, strip) hunks = [s.decode("utf-8") for s in item.hunks[0].text] new_file = "".join(hunk[1:] for hunk in hunks) save(target, new_file) elif "dev/null" in target: source = self.strip_path(source, root, strip) safe_unlink(source) else: items.append(item) self.items = items if root: prevdir = os.getcwd() os.chdir(root) total = len(self.items) errors = 0 if strip: # [ ] test strip level exceeds nesting level # [ ] test the same only for selected files # [ ] test if files end up being on the same level try: strip = int(strip) except ValueError: errors += 1 warning("error: strip parameter '%s' must be an integer" % strip) strip = 0 #for fileno, filename in enumerate(self.source): for i,p in enumerate(self.items): if strip: debug("stripping %s leading component(s) from:" % strip) debug(" %s" % p.source) debug(" %s" % p.target) old = p.source if p.source == b'/dev/null' else pathstrip(p.source, strip) new = p.target if p.target == b'/dev/null' else pathstrip(p.target, strip) else: old, new = p.source, p.target filenameo, filenamen = self.findfiles(old, new) if not filenameo or not filenamen: error("source/target file does not exist:\n --- %s\n +++ %s" % (old, new)) errors += 1 continue if not isfile(filenameo): error("not a file - %s" % filenameo) errors += 1 continue # [ ] check absolute paths security here debug("processing %d/%d:\t %s" % (i+1, total, filenamen)) # validate before patching f2fp = open(filenameo, 'rb') hunkno = 0 hunk = p.hunks[hunkno] hunkfind = [] hunkreplace = [] validhunks = 0 canpatch = False for lineno, line in enumerate(f2fp): if lineno+1 < hunk.startsrc: continue elif lineno+1 == hunk.startsrc: hunkfind = [x[1:].rstrip(b"\r\n") for x in hunk.text if x[0] in b" -"] hunkreplace = [x[1:].rstrip(b"\r\n") for x in hunk.text if x[0] in b" +"] #pprint(hunkreplace) hunklineno = 0 # todo \ No newline at end of file # check hunks in source file if lineno+1 < hunk.startsrc+len(hunkfind): if line.rstrip(b"\r\n") == hunkfind[hunklineno]: hunklineno += 1 else: warning("file %d/%d:\t %s" % (i+1, total, filenamen)) warning(" hunk no.%d doesn't match source file at line %d" % (hunkno+1, lineno+1)) warning(" expected: %s" % hunkfind[hunklineno]) warning(" actual : %s" % line.rstrip(b"\r\n")) if fuzz: hunklineno += 1 else: # not counting this as error, because file may already be patched. # check if file is already patched is done after the number of # invalid hunks if found # TODO: check hunks against source/target file in one pass # API - check(stream, srchunks, tgthunks) # return tuple (srcerrs, tgterrs) # continue to check other hunks for completeness hunkno += 1 if hunkno < len(p.hunks): hunk = p.hunks[hunkno] continue else: break # check if processed line is the last line if len(hunkfind) == 0 or lineno+1 == hunk.startsrc+len(hunkfind)-1: debug(" hunk no.%d for file %s -- is ready to be patched" % (hunkno+1, filenamen)) hunkno+=1 validhunks+=1 if hunkno < len(p.hunks): hunk = p.hunks[hunkno] else: if validhunks == len(p.hunks): # patch file canpatch = True break else: if hunkno < len(p.hunks): error("premature end of source file %s at hunk %d" % (filenameo, hunkno+1)) errors += 1 f2fp.close() if validhunks < len(p.hunks): if self._match_file_hunks(filenameo, p.hunks): warning("already patched %s" % filenameo) else: if fuzz: warning("source file is different - %s" % filenameo) else: error("source file is different - %s" % filenameo) errors += 1 if canpatch: backupname = filenamen+b".orig" if exists(backupname): warning("can't backup original file to %s - aborting" % backupname) errors += 1 else: shutil.move(filenamen, backupname) if self.write_hunks(backupname if filenameo == filenamen else filenameo, filenamen, p.hunks): info("successfully patched %d/%d:\t %s" % (i+1, total, filenamen)) safe_unlink(backupname) if new == b'/dev/null': # check that filename is of size 0 and delete it. if os.path.getsize(filenamen) > 0: warning("expected patched file to be empty as it's marked as deletion:\t %s" % filenamen) safe_unlink(filenamen) else: errors += 1 warning("error patching file %s" % filenamen) shutil.copy(filenamen, filenamen+".invalid") warning("invalid version is saved to %s" % filenamen+".invalid") # todo: proper rejects shutil.move(backupname, filenamen) if root: os.chdir(prevdir) # todo: check for premature eof return (errors == 0) def _reverse(self): """ reverse patch direction (this doesn't touch filenames) """ for p in self.items: for h in p.hunks: h.startsrc, h.starttgt = h.starttgt, h.startsrc h.linessrc, h.linestgt = h.linestgt, h.linessrc for i,line in enumerate(h.text): # need to use line[0:1] here, because line[0] # returns int instead of bytes on Python 3 if line[0:1] == b'+': h.text[i] = b'-' + line[1:] elif line[0:1] == b'-': h.text[i] = b'+' +line[1:] def revert(self, strip=0, root=None): """ apply patch in reverse order """ reverted = copy.deepcopy(self) reverted._reverse() return reverted.apply(strip, root) def can_patch(self, filename): """ Check if specified filename can be patched. Returns None if file can not be found among source filenames. False if patch can not be applied clearly. True otherwise. :returns: True, False or None """ filename = abspath(filename) for p in self.items: if filename == abspath(p.source): return self._match_file_hunks(filename, p.hunks) return None def _match_file_hunks(self, filepath, hunks): matched = True fp = open(abspath(filepath), 'rb') class NoMatch(Exception): pass lineno = 1 line = fp.readline() try: for hno, h in enumerate(hunks): # skip to first line of the hunk while lineno < h.starttgt: if not len(line): # eof debug("check failed - premature eof before hunk: %d" % (hno+1)) raise NoMatch line = fp.readline() lineno += 1 for hline in h.text: if hline.startswith(b"-"): continue if not len(line): debug("check failed - premature eof on hunk: %d" % (hno+1)) # todo: \ No newline at the end of file raise NoMatch if line.rstrip(b"\r\n") != hline[1:].rstrip(b"\r\n"): debug("file is not patched - failed hunk: %d" % (hno+1)) raise NoMatch line = fp.readline() lineno += 1 except NoMatch: matched = False # todo: display failed hunk, i.e. expected/found fp.close() return matched def patch_stream(self, instream, hunks): """ Generator that yields stream patched with hunks iterable Converts lineends in hunk lines to the best suitable format autodetected from input """ # todo: At the moment substituted lineends may not be the same # at the start and at the end of patching. Also issue a # warning/throw about mixed lineends (is it really needed?) hunks = iter(hunks) srclineno = 1 lineends = {b'\n':0, b'\r\n':0, b'\r':0} def get_line(): """ local utility function - return line from source stream collecting line end statistics on the way """ line = instream.readline() # 'U' mode works only with text files if line.endswith(b"\r\n"): lineends[b"\r\n"] += 1 elif line.endswith(b"\n"): lineends[b"\n"] += 1 elif line.endswith(b"\r"): lineends[b"\r"] += 1 return line for hno, h in enumerate(hunks): debug("hunk %d" % (hno+1)) # skip to line just before hunk starts while srclineno < h.startsrc: yield get_line() srclineno += 1 for hline in h.text: # todo: check \ No newline at the end of file if hline.startswith(b"-") or hline.startswith(b"\\"): get_line() srclineno += 1 continue else: if not hline.startswith(b"+"): yield get_line() srclineno += 1 continue line2write = hline[1:] # detect if line ends are consistent in source file if sum([bool(lineends[x]) for x in lineends]) == 1: newline = [x for x in lineends if lineends[x] != 0][0] yield line2write.rstrip(b"\r\n")+newline else: # newlines are mixed yield line2write for line in instream: yield line def write_hunks(self, srcname, tgtname, hunks): src = open(srcname, "rb") tgt = open(tgtname, "wb") debug("processing target file %s" % tgtname) tgt.writelines(self.patch_stream(src, hunks)) tgt.close() src.close() # [ ] TODO: add test for permission copy shutil.copymode(srcname, tgtname) return True def dump(self): for p in self.items: for headline in p.header: print(headline.rstrip('\n')) print('--- ' + p.source) print('+++ ' + p.target) for h in p.hunks: print('@@ -%s,%s +%s,%s @@' % (h.startsrc, h.linessrc, h.starttgt, h.linestgt)) for line in h.text: print(line.rstrip('\n')) def main(): from optparse import OptionParser from os.path import exists import sys opt = OptionParser(usage="1. %prog [options] unified.diff\n" " 2. %prog [options] http://host/patch\n" " 3. %prog [options] -- < unified.diff", version="python-patch %s" % __version__) opt.add_option("-q", "--quiet", action="store_const", dest="verbosity", const=0, help="print only warnings and errors", default=1) opt.add_option("-v", "--verbose", action="store_const", dest="verbosity", const=2, help="be verbose") opt.add_option("--debug", action="store_true", dest="debugmode", help="debug mode") opt.add_option("--diffstat", action="store_true", dest="diffstat", help="print diffstat and exit") opt.add_option("-d", "--directory", metavar='DIR', help="specify root directory for applying patch") opt.add_option("-p", "--strip", type="int", metavar='N', default=0, help="strip N path components from filenames") opt.add_option("--revert", action="store_true", help="apply patch in reverse order (unpatch)") opt.add_option("-f", "--fuzz", action="store_true", dest="fuzz", help="Accept fuuzzy patches") (options, args) = opt.parse_args() if not args and sys.argv[-1:] != ['--']: opt.print_version() opt.print_help() sys.exit() readstdin = (sys.argv[-1:] == ['--'] and not args) verbosity_levels = {0:logging.WARNING, 1:logging.INFO, 2:logging.DEBUG} loglevel = verbosity_levels[options.verbosity] logformat = "%(message)s" logger.setLevel(loglevel) streamhandler.setFormatter(logging.Formatter(logformat)) if options.debugmode: setdebug() # this sets global debugmode variable if readstdin: patch = PatchSet(sys.stdin) else: patchfile = args[0] urltest = patchfile.split(':')[0] if (':' in patchfile and urltest.isalpha() and len(urltest) > 1): # one char before : is a windows drive letter patch = fromurl(patchfile) else: if not exists(patchfile) or not isfile(patchfile): sys.exit("patch file does not exist - %s" % patchfile) patch = fromfile(patchfile) if options.diffstat: print(patch.diffstat()) sys.exit(0) if not patch: error("Could not parse patch") sys.exit(-1) #pprint(patch) if options.revert: patch.revert(options.strip, root=options.directory) or sys.exit(-1) else: patch.apply(options.strip, root=options.directory, fuzz=options.fuzz) or sys.exit(-1) # todo: document and test line ends handling logic - patch_ng.py detects proper line-endings # for inserted hunks and issues a warning if patched file has incosistent line ends if __name__ == "__main__": main() # Legend: # [ ] - some thing to be done # [w] - official wart, external or internal that is unlikely to be fixed # [ ] API break (2.x) wishlist # PatchSet.items --> PatchSet.patches # [ ] run --revert test for all dataset items # [ ] run .parse() / .dump() test for dataset python-patch-ng-1.17.4/setup.py000066400000000000000000000107521363443050500163460ustar00rootroot00000000000000"""A setuptools based setup module. See: https://packaging.python.org/en/latest/distributing.html https://github.com/pypa/sampleproject """ # Always prefer setuptools over distutils import re import os from setuptools import setup, find_packages # To use a consistent encoding from codecs import open here = os.path.abspath(os.path.dirname(__file__)) # Get the long description from the README file with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: long_description = f.read() def get_requires(filename): requirements = [] with open(filename) as req_file: for line in req_file.read().splitlines(): if not line.strip().startswith("#"): requirements.append(line) return requirements def load_version(): """Loads a file content""" filename = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "patch_ng.py")) with open(filename, "rt") as version_file: content = version_file.read() version = re.search('__version__ = "([0-9a-z.-]+)"', content).group(1) return version setup( name='patch-ng', # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html version=load_version(), # This is an optional longer description of your project that represents # the body of text which users will see when they visit PyPI. # # Often, this is the same as your README, so you can just read it in from # that file directly (as we have already done above) # # This field corresponds to the "Description" metadata field: # https://packaging.python.org/specifications/core-metadata/#description-optional long_description=long_description, # Optional description='Library to parse and apply unified diffs.', # The project's main homepage. url='https://github.com/conan-io/python-patch', # Author details author='Conan.io', author_email='info@conan.io', # Choose your license license='MIT', # See https://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'Topic :: Software Development :: Build Tools', 'License :: OSI Approved :: MIT License', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', ], # What does your project relate to? keywords=['patch', 'parse', 'diff', 'strip', 'diffstat'], # You can just specify the packages manually here if your project is # simple. Or you can use find_packages(). # packages=find_packages(exclude=['tests']), # Alternatively, if you want to distribute just a my_module.py, uncomment # this: py_modules=["patch_ng"], # List run-time dependencies here. These will be installed by pip when # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html # install_requires=get_requires('requirements.txt'), # List additional groups of dependencies here (e.g. development # dependencies). You can install these using the following syntax, # for example: # $ pip install -e .[dev,test] #extras_require={ # 'test': get_requires(os.path.join('tests', 'requirements_test.txt')) #}, # If there are data files included in your packages that need to be # installed, specify them here. If using Python 2.6 or less, then these # have to be included in MANIFEST.in as well. package_data={ '': ['*.md', 'LICENSE'], }, # Although 'package_data' is the preferred approach, in some case you may # need to place data files outside of your packages. See: # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa # In this case, 'data_file' will be installed into '/my_data' # data_files=[('my_data', ['data/data_file'])], # To provide executable scripts, use entry points in preference to the # "scripts" keyword. Entry points provide cross-platform support and allow # pip to create the appropriate form of executable for the target platform. #entry_points={ # 'console_scripts': [ # 'patch_ng.py=patch', # ], #}, ) python-patch-ng-1.17.4/tests/000077500000000000000000000000001363443050500157715ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/01uni_multi/000077500000000000000000000000001363443050500201375ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/01uni_multi/01uni_multi.patch000066400000000000000000000154071363443050500233350ustar00rootroot00000000000000Index: updatedlg.cpp =================================================================== --- updatedlg.cpp (revision 5095) +++ updatedlg.cpp (working copy) @@ -94,11 +94,13 @@ lst->InsertColumn(1, _("Version")); lst->InsertColumn(2, _("Installed")); lst->InsertColumn(3, _("Size"), wxLIST_FORMAT_RIGHT); + lst->InsertColumn(4, _("Rev")); - lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3) - 2); // 1st column takes all remaining space + lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3 + 40) - 6 ); // 1st column takes all remaining space lst->SetColumnWidth(1, 64); lst->SetColumnWidth(2, 64); lst->SetColumnWidth(3, 64); + lst->SetColumnWidth(4, 40); } void UpdateDlg::AddRecordToList(UpdateRec* rec) @@ -111,8 +113,20 @@ lst->SetItem(idx, 1, rec->version); lst->SetItem(idx, 2, rec->installed_version); lst->SetItem(idx, 3, rec->size); + lst->SetItem(idx, 4, rec->revision); } +wxString UpdateDlg::GetListColumnText(int idx, int col) { + wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); + int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx; + wxListItem info; + info.SetId(index); + info.SetColumn(col); + info.SetMask(wxLIST_MASK_TEXT); + lst->GetItem(info); + return info.GetText(); +} + void UpdateDlg::SetListColumnText(int idx, int col, const wxString& text) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); @@ -393,7 +407,9 @@ if (index == -1) return 0; wxString title = lst->GetItemText(index); - return FindRecByTitle(title, m_Recs, m_RecsCount); + wxString version = GetListColumnText(index, 1); + wxString revision = GetListColumnText(index, 4); + return FindRec(title, version, revision, m_Recs, m_RecsCount); } void UpdateDlg::DownloadFile(bool dontInstall) Index: updatedlg.h =================================================================== --- updatedlg.h (revision 5095) +++ updatedlg.h (working copy) @@ -49,6 +49,7 @@ UpdateRec* GetRecFromListView(); void CreateListColumns(); void AddRecordToList(UpdateRec* rec); + wxString GetListColumnText(int idx, int col); void SetListColumnText(int idx, int col, const wxString& text); wxString GetConfFilename(); Index: manifest.xml =================================================================== --- manifest.xml (revision 5095) +++ manifest.xml (working copy) @@ -2,18 +2,19 @@ - - + + + Julian R Seward for libbzip2. + + libbzip2 copyright notice: + bzip2 and associated library libbzip2, are + copyright (C) 1996-2000 Julian R Seward. + All rights reserved." /> Index: conf.cpp =================================================================== --- conf.cpp (revision 5095) +++ conf.cpp (working copy) @@ -46,10 +46,16 @@ // fix title // devpaks.org has changed the title to contain some extra info // e.g.: [libunicows Library version: 1.1.1 Devpak revision: 1sid] - // we don't need this extra info, so if we find it we remove it - int pos = rec.title.Find(_T("Library version:")); + int pos = rec.title.Lower().Find(_T("library version:")); if (pos != -1) { + int revpos = rec.title.Lower().Find(_T("devpak revision:")); + if (revpos != -1) { + rec.revision = rec.title.Mid(revpos).AfterFirst(_T(':')).Trim(false); + rec.revision.Replace(_T("\t"), _T(" ")); + rec.revision = rec.revision.BeforeFirst(_T(' ')); + } + rec.title.Truncate(pos); rec.title = rec.title.Trim(false); rec.title = rec.title.Trim(true); @@ -60,7 +66,7 @@ rec.remote_file = ini.GetKeyValue(i, _T("RemoteFilename")); rec.local_file = ini.GetKeyValue(i, _T("LocalFilename")); rec.groups = GetArrayFromString(ini.GetKeyValue(i, _T("Group")), _T(",")); - rec.install = ini.GetKeyValue(i, _T("InstallPath")); + rec.install_path = ini.GetKeyValue(i, _T("InstallPath")); rec.version = ini.GetKeyValue(i, _T("Version")); ini.GetKeyValue(i, _T("Size")).ToLong(&rec.bytes); rec.date = ini.GetKeyValue(i, _T("Date")); @@ -99,12 +105,17 @@ return list; } -UpdateRec* FindRecByTitle(const wxString& title, UpdateRec* list, int count) +UpdateRec* FindRec(const wxString& title, const wxString& version, const wxString& revision, UpdateRec* list, int count) { for (int i = 0; i < count; ++i) { - if (list[i].title == title) - return &list[i]; + if (list[i].title == title && list[i].version == version) { + if (revision.IsEmpty()) { + return &list[i]; + } else if (list[i].revision == revision) { + return &list[i]; + } + } } return 0; } Index: conf.h =================================================================== --- conf.h (revision 5095) +++ conf.h (working copy) @@ -7,7 +7,7 @@ struct UpdateRec { - wxString entry; + wxString entry; //! .entry filename for installed wxString title; wxString name; wxString desc; @@ -15,8 +15,9 @@ wxString remote_file; wxString local_file; wxArrayString groups; - wxString install; + wxString install_path; //! ignored wxString version; + wxString revision; wxString installed_version; long int bytes; float kilobytes; @@ -31,7 +32,7 @@ extern wxString g_MasterPath; UpdateRec* ReadConf(const IniParser& ini, int* recCount, const wxString& currentServer, const wxString& appPath); -UpdateRec* FindRecByTitle(const wxString& title, UpdateRec* list, int count); +UpdateRec* FindRec(const wxString& title, const wxString& version, const wxString& revision, UpdateRec* list, int count); // utility wxString GetSizeString(int bytes); python-patch-ng-1.17.4/tests/01uni_multi/[result]/000077500000000000000000000000001363443050500217455ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/01uni_multi/[result]/conf.cpp000066400000000000000000000102461363443050500234010ustar00rootroot00000000000000/* * This file is part of the Code::Blocks IDE and licensed under the GNU General Public License, version 3 * http://www.gnu.org/licenses/gpl-3.0.html * * $Revision: 4909 $ * $Id: conf.cpp 4909 2008-02-27 13:15:26Z mortenmacfly $ * $HeadURL: http://svn.berlios.de/svnroot/repos/codeblocks/tags/8.02/src/plugins/contrib/devpak_plugin/conf.cpp $ */ #include "conf.h" #include #include #include #include wxString g_MasterPath; wxString GetSizeString(int bytes) { wxString ret; float kilobytes = (float)bytes / 1024.0f; float megabytes = kilobytes / 1024.0f; if (megabytes >= 1.0f) ret.Printf(_("%.2f MB"), megabytes); else if (kilobytes >= 1.0f) ret.Printf(_("%.2f KB"), kilobytes); else ret.Printf(_("%ld bytes"), bytes); return ret; } UpdateRec* ReadConf(const IniParser& ini, int* recCount, const wxString& currentServer, const wxString& appPath) { *recCount = 0; int groupsCount = ini.GetGroupsCount(); if (groupsCount == 0) return 0; UpdateRec* list = new UpdateRec[ini.GetGroupsCount()]; for (int i = 0; i < groupsCount; ++i) { UpdateRec& rec = list[i]; rec.title = ini.GetGroupName(i); // fix title // devpaks.org has changed the title to contain some extra info // e.g.: [libunicows Library version: 1.1.1 Devpak revision: 1sid] int pos = rec.title.Lower().Find(_T("library version:")); if (pos != -1) { int revpos = rec.title.Lower().Find(_T("devpak revision:")); if (revpos != -1) { rec.revision = rec.title.Mid(revpos).AfterFirst(_T(':')).Trim(false); rec.revision.Replace(_T("\t"), _T(" ")); rec.revision = rec.revision.BeforeFirst(_T(' ')); } rec.title.Truncate(pos); rec.title = rec.title.Trim(false); rec.title = rec.title.Trim(true); } rec.name = ini.GetKeyValue(i, _T("Name")); rec.desc = ini.GetKeyValue(i, _T("Description")); rec.remote_file = ini.GetKeyValue(i, _T("RemoteFilename")); rec.local_file = ini.GetKeyValue(i, _T("LocalFilename")); rec.groups = GetArrayFromString(ini.GetKeyValue(i, _T("Group")), _T(",")); rec.install_path = ini.GetKeyValue(i, _T("InstallPath")); rec.version = ini.GetKeyValue(i, _T("Version")); ini.GetKeyValue(i, _T("Size")).ToLong(&rec.bytes); rec.date = ini.GetKeyValue(i, _T("Date")); rec.installable = ini.GetKeyValue(i, _T("Execute")) == _T("1"); // read .entry file (if exists) rec.entry = (!rec.name.IsEmpty() ? rec.name : wxFileName(rec.local_file).GetName()) + _T(".entry"); IniParser p; p.ParseFile(appPath + rec.entry); rec.installed_version = p.GetValue(_T("Setup"), _T("AppVersion")); rec.downloaded = wxFileExists(appPath + _T("/") + rec.local_file); rec.installed = !rec.installed_version.IsEmpty(); // calculate size rec.size = GetSizeString(rec.bytes); // fix-up if (rec.name.IsEmpty()) rec.name = rec.title; rec.desc.Replace(_T(""), _T("\n")); rec.desc.Replace(_T(""), _T("\r")); wxURL url(rec.remote_file); if (!url.GetServer().IsEmpty()) { rec.remote_server = url.GetScheme() + _T("://") + url.GetServer(); int pos = rec.remote_file.Find(url.GetServer()); if (pos != wxNOT_FOUND) rec.remote_file.Remove(0, pos + url.GetServer().Length() + 1); } else rec.remote_server = currentServer; } *recCount = groupsCount; return list; } UpdateRec* FindRec(const wxString& title, const wxString& version, const wxString& revision, UpdateRec* list, int count) { for (int i = 0; i < count; ++i) { if (list[i].title == title && list[i].version == version) { if (revision.IsEmpty()) { return &list[i]; } else if (list[i].revision == revision) { return &list[i]; } } } return 0; } python-patch-ng-1.17.4/tests/01uni_multi/[result]/conf.h000066400000000000000000000017531363443050500230510ustar00rootroot00000000000000#ifndef CONF_H #define CONF_H #include #include #include "cbiniparser.h" struct UpdateRec { wxString entry; //! .entry filename for installed wxString title; wxString name; wxString desc; wxString remote_server; wxString remote_file; wxString local_file; wxArrayString groups; wxString install_path; //! ignored wxString version; wxString revision; wxString installed_version; long int bytes; float kilobytes; float megabytes; wxString size; wxString date; bool installable; bool downloaded; bool installed; }; extern wxString g_MasterPath; UpdateRec* ReadConf(const IniParser& ini, int* recCount, const wxString& currentServer, const wxString& appPath); UpdateRec* FindRec(const wxString& title, const wxString& version, const wxString& revision, UpdateRec* list, int count); // utility wxString GetSizeString(int bytes); #endif // CONF_H python-patch-ng-1.17.4/tests/01uni_multi/[result]/manifest.xml000066400000000000000000000015201363443050500242730ustar00rootroot00000000000000 python-patch-ng-1.17.4/tests/01uni_multi/[result]/updatedlg.cpp000066400000000000000000000551101363443050500244240ustar00rootroot00000000000000/* * This file is part of the Code::Blocks IDE and licensed under the GNU General Public License, version 3 * http://www.gnu.org/licenses/gpl-3.0.html * * $Revision: 4909 $ * $Id: updatedlg.cpp 4909 2008-02-27 13:15:26Z mortenmacfly $ * $HeadURL: http://svn.berlios.de/svnroot/repos/codeblocks/tags/8.02/src/plugins/contrib/devpak_plugin/updatedlg.cpp $ */ #include "updatedlg.h" #include #include #include #include #include #include #include #include #include #include #include "devpakinstaller.h" #include "crc32.h" #include "manager.h" #include "configmanager.h" #include "globals.h" int idNet = wxNewId(); int idPopupInstall = wxNewId(); int idPopupDownload = wxNewId(); int idPopupDownloadAndInstall = wxNewId(); int idPopupUninstall = wxNewId(); BEGIN_EVENT_TABLE(UpdateDlg, wxDialog) EVT_UPDATE_UI(-1, UpdateDlg::OnUpdateUI) EVT_TREE_SEL_CHANGED(XRCID("tvCategories"), UpdateDlg::OnTreeSelChanged) EVT_LIST_ITEM_SELECTED(XRCID("lvFiles"), UpdateDlg::OnFileSelected) EVT_LIST_ITEM_DESELECTED(XRCID("lvFiles"), UpdateDlg::OnFileDeSelected) EVT_LIST_ITEM_RIGHT_CLICK(XRCID("lvFiles"), UpdateDlg::OnFileRightClick) EVT_MENU(idPopupDownload, UpdateDlg::OnDownload) EVT_MENU(idPopupDownloadAndInstall, UpdateDlg::OnDownloadAndInstall) EVT_MENU(idPopupInstall, UpdateDlg::OnInstall) EVT_MENU(idPopupUninstall, UpdateDlg::OnUninstall) EVT_COMBOBOX(XRCID("cmbServer"), UpdateDlg::OnServerChange) EVT_COMBOBOX(XRCID("cmbFilter"), UpdateDlg::OnFilterChange) EVT_CHECKBOX(XRCID("chkCache"), UpdateDlg::OnServerChange) EVT_CBNET_CONNECT(idNet, UpdateDlg::OnConnect) EVT_CBNET_DISCONNECT(idNet, UpdateDlg::OnDisConnect) EVT_CBNET_PROGRESS(idNet, UpdateDlg::OnProgress) EVT_CBNET_ABORTED(idNet, UpdateDlg::OnAborted) EVT_CBNET_START_DOWNLOAD(idNet, UpdateDlg::OnDownloadStarted) EVT_CBNET_END_DOWNLOAD(idNet, UpdateDlg::OnDownloadEnded) END_EVENT_TABLE() UpdateDlg::UpdateDlg(wxWindow* parent) : m_Recs(0), m_RecsCount(0), m_CurrFileSize(0), m_LastBlockSize(0), m_HasUpdated(false), m_FirstTimeCheck(true), m_Net(this, idNet, _T("http://devpaks.sourceforge.net/")) { //ctor wxXmlResource::Get()->LoadDialog(this, parent, _T("MainFrame")); CreateListColumns(); FillServers(); UpdateStatus(_("Ready"), 0); } UpdateDlg::~UpdateDlg() { //dtor delete[] m_Recs; m_RecsCount = 0; } void UpdateDlg::EndModal(int retCode) { if (!m_Net.IsConnected() || retCode != wxID_CANCEL) { wxDialog::EndModal(retCode); return; } if (m_Net.IsConnected()) m_Net.Abort(); } void UpdateDlg::CreateListColumns() { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); lst->InsertColumn(0, _("Title")); lst->InsertColumn(1, _("Version")); lst->InsertColumn(2, _("Installed")); lst->InsertColumn(3, _("Size"), wxLIST_FORMAT_RIGHT); lst->InsertColumn(4, _("Rev")); lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3 + 40) - 6 ); // 1st column takes all remaining space lst->SetColumnWidth(1, 64); lst->SetColumnWidth(2, 64); lst->SetColumnWidth(3, 64); lst->SetColumnWidth(4, 40); } void UpdateDlg::AddRecordToList(UpdateRec* rec) { if (!rec) return; wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int idx = lst->GetItemCount(); lst->InsertItem(idx, rec->title); lst->SetItem(idx, 1, rec->version); lst->SetItem(idx, 2, rec->installed_version); lst->SetItem(idx, 3, rec->size); lst->SetItem(idx, 4, rec->revision); } wxString UpdateDlg::GetListColumnText(int idx, int col) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx; wxListItem info; info.SetId(index); info.SetColumn(col); info.SetMask(wxLIST_MASK_TEXT); lst->GetItem(info); return info.GetText(); } void UpdateDlg::SetListColumnText(int idx, int col, const wxString& text) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx; wxListItem it; it.m_itemId = index; it.m_col = col; it.m_mask = wxLIST_MASK_TEXT; it.m_text = text; lst->SetItem(it); } void UpdateDlg::UpdateStatus(const wxString& status, int curProgress, int maxProgress) { wxStaticText* lbl = XRCCTRL(*this, "lblStatus", wxStaticText); if (lbl->GetLabel() != status) lbl->SetLabel(status); if (curProgress != -1) XRCCTRL(*this, "gauProgress", wxGauge)->SetValue(curProgress); if (maxProgress != -1) XRCCTRL(*this, "gauProgress", wxGauge)->SetRange(maxProgress); } void UpdateDlg::EnableButtons(bool update, bool abort) { wxButton* btnCl = XRCCTRL(*this, "wxID_CANCEL", wxButton); btnCl->Enable(abort); // disable server list and cache checkbox while downloading XRCCTRL(*this, "cmbServer", wxComboBox)->Enable(!m_Net.IsConnected()); XRCCTRL(*this, "chkCache", wxCheckBox)->Enable(!m_Net.IsConnected()); wxYield(); } void UpdateDlg::FillGroups() { UpdateStatus(_("Parsing list of updates"), 0, m_RecsCount - 1); // get a list of unique group names wxArrayString groups; for (int i = 0; i < m_RecsCount; ++i) { for (unsigned int x = 0; x < m_Recs[i].groups.GetCount(); ++x) { if (m_Recs[i].groups[x].IsEmpty()) continue; if (groups.Index(m_Recs[i].groups[x]) == wxNOT_FOUND) { if (FilterRec(&m_Recs[i])) groups.Add(m_Recs[i].groups[x]); } } } // create the groups tree wxTreeCtrl* tree = XRCCTRL(*this, "tvCategories", wxTreeCtrl); tree->Freeze(); tree->DeleteAllItems(); wxTreeItemId root = tree->AddRoot(_("All categories")); for (unsigned int i = 0; i < groups.GetCount(); ++i) { tree->AppendItem(root, groups[i]); } tree->SortChildren(root); tree->Thaw(); tree->Expand(root); tree->SelectItem(root); // this calls the event UpdateStatus(_("Done parsing list of updates"), 0); } void UpdateDlg::FillFiles(const wxTreeItemId& id) { wxTreeCtrl* tree = XRCCTRL(*this, "tvCategories", wxTreeCtrl); wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); lst->Freeze(); lst->ClearAll(); CreateListColumns(); wxString group = id == tree->GetRootItem() ? _T("") : tree->GetItemText(id); // add files belonging to group int counter = 0; for (int i = 0; i < m_RecsCount; ++i) { if (group.IsEmpty() || (!m_Recs[i].groups.IsEmpty() && m_Recs[i].groups.Index(group) != wxNOT_FOUND)) { // filter if (FilterRec(&m_Recs[i])) { AddRecordToList(&m_Recs[i]); ++counter; } } } lst->Thaw(); // select first item lst->SetItemState(0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); } void UpdateDlg::FillFileDetails(const wxListItem& id) { wxTextCtrl* txt = XRCCTRL(*this, "txtInfo", wxTextCtrl); txt->Clear(); UpdateRec* cur = GetRecFromListView(); if (!cur) { txt->Clear(); EnableButtons(); return; } txt->AppendText(_("Name: ") + cur->name + _T("\n")); // txt->AppendText(_("Server: ") + cur->remote_server + _T("\n")); // txt->AppendText(_("File: ") + cur->remote_file + _T("\n")); txt->AppendText(_("Version: ") + cur->version + _T("\n")); txt->AppendText(_("Size: ") + cur->size + _T("\n")); txt->AppendText(_("Date: ") + cur->date + _T("\n\n")); txt->AppendText(_("Description: \n")); txt->AppendText(cur->desc); txt->SetSelection(0, 0); txt->SetInsertionPoint(0); } void UpdateDlg::InternetUpdate(bool forceDownload) { UpdateStatus(_("Please wait...")); m_HasUpdated = false; m_Net.SetServer(GetCurrentServer()); EnableButtons(false); forceDownload = forceDownload || !XRCCTRL(*this, "chkCache", wxCheckBox)->GetValue(); bool forceDownloadMirrors = forceDownload || !wxFileExists(GetMirrorsFilename()); if (forceDownloadMirrors) { if (!m_Net.DownloadFile(_T("mirrors.cfg"), GetMirrorsFilename())) { UpdateStatus(_("Error downloading list of mirrors"), 0, 0); return; } else { FillServers(); m_Net.SetServer(GetCurrentServer()); // update server based on mirrors } } wxString config = GetConfFilename(); forceDownload = forceDownload || !wxFileExists(config); if (forceDownload && !m_Net.DownloadFile(_T("webupdate.conf"), config)) { UpdateStatus(_("Error downloading list of updates"), 0, 0); return; } else { IniParser ini; if (!ini.ParseFile(config)) { UpdateStatus(_("Failed to retrieve the list of updates"), 0, 0); return; } ini.Sort(); if (m_Recs) delete[] m_Recs; // remember to delete[] m_Recs when we 're done with it!!! // it's our responsibility once given to us m_Recs = ReadConf(ini, &m_RecsCount, GetCurrentServer(), GetPackagePath()); FillGroups(); } EnableButtons(); UpdateStatus(_("Ready"), 0, 0); m_HasUpdated = true; } void UpdateDlg::FillServers() { wxComboBox* cmb = XRCCTRL(*this, "cmbServer", wxComboBox); cmb->Clear(); m_Servers.Clear(); IniParser ini; ini.ParseFile(GetMirrorsFilename()); int group = ini.FindGroupByName(_T("WebUpdate mirrors")); for (int i = 0; group != -1 && i < ini.GetKeysCount(group); ++i) { cmb->Append(ini.GetKeyName(group, i)); m_Servers.Add(ini.GetKeyValue(group, i)); } if (cmb->GetCount() == 0) { cmb->Append(_("devpaks.org Community Devpaks")); m_Servers.Add(_T("http://devpaks.sourceforge.net/")); } cmb->SetSelection(0); } wxString UpdateDlg::GetConfFilename() { int server_hash = GetTextCRC32(GetCurrentServer().mb_str()); wxString config; config = ConfigManager::GetConfigFolder() + wxFILE_SEP_PATH; config.Printf(_T("%sdevpak_%x.conf"), config.c_str(), server_hash); return config; } wxString UpdateDlg::GetMirrorsFilename() const { wxString config; config = ConfigManager::GetConfigFolder() + wxFILE_SEP_PATH + _T("devpak_mirrors.cfg"); return config; } wxString UpdateDlg::GetCurrentServer() const { return m_Servers[XRCCTRL(*this, "cmbServer", wxComboBox)->GetSelection()]; } wxString UpdateDlg::GetBasePath() const { return g_MasterPath + wxFILE_SEP_PATH; } wxString UpdateDlg::GetPackagePath() const { return GetBasePath() + _T("Packages") + wxFILE_SEP_PATH; } bool UpdateDlg::FilterRec(UpdateRec* rec) { if (!rec) return false; wxComboBox* cmb = XRCCTRL(*this, "cmbFilter", wxComboBox); switch (cmb->GetSelection()) { case 0: // All return true; case 1: // Installed return rec->installed; case 2: // installed with update available return rec->installed && rec->version != rec->installed_version; case 3: // downloaded but not installed return rec->downloaded && !rec->installed; case 4: // not installed return !rec->downloaded && !rec->installed; default: return false; } return false; // doesn't reach here } void UpdateDlg::ApplyFilter() { wxTreeCtrl* tree = XRCCTRL(*this, "tvCategories", wxTreeCtrl); FillGroups(); FillFiles(tree->GetSelection()); EnableButtons(); } UpdateRec* UpdateDlg::GetRecFromListView() { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int index = lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (index == -1) return 0; wxString title = lst->GetItemText(index); wxString version = GetListColumnText(index, 1); wxString revision = GetListColumnText(index, 4); return FindRec(title, version, revision, m_Recs, m_RecsCount); } void UpdateDlg::DownloadFile(bool dontInstall) { UpdateStatus(_("Please wait...")); UpdateRec* rec = GetRecFromListView(); if (!rec) { wxMessageBox(_("No file selected!"), _("Error"), wxICON_ERROR); UpdateStatus(_("Ready"), 0, 0); return; } if (rec->version == rec->installed_version) { if (wxMessageBox(_("You seem to have installed the latest version.\nAre you sure you want to proceed?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxNO) return; } if (!CreateDirRecursively(GetPackagePath())) { wxMessageBox(_("Can't create directory ") + GetPackagePath(), _("Error"), wxICON_ERROR); return; } if (wxFileExists(GetPackagePath() + rec->local_file)) { if (wxMessageBox(_("This file already exists!\nAre you sure you want to download it again?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxNO && rec->installable) { if (!dontInstall && wxMessageBox(_("Do you want to force-install it?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxYES) InstallFile(); return; } } m_Net.SetServer(rec->remote_server); EnableButtons(false); if (!m_Net.DownloadFile(rec->remote_file, GetPackagePath() + rec->local_file)) { rec->downloaded = false; UpdateStatus(_("Error downloading file: ") + rec->remote_server + _T(" > ") + rec->remote_file, 0, 0); return; } else rec->downloaded = true; UpdateStatus(_("Ready"), 0, 0); EnableButtons(); } void UpdateDlg::InstallFile() { UpdateStatus(_("Please wait...")); UpdateRec* rec = GetRecFromListView(); if (!rec) { wxMessageBox(_("No file selected!"), _("Error"), wxICON_ERROR); UpdateStatus(_("Ready"), 0, 0); return; } wxYield(); if (rec->title == _T("WebUpdate Mirrors list")) { InstallMirrors(GetPackagePath() + rec->local_file); rec->installed = true; ApplyFilter(); UpdateStatus(_("Ready"), 0, 0); return; } else if (!rec->installable) { UpdateStatus(_("Ready"), 0, 0); return; } if (!CreateDirRecursively(GetPackagePath())) { UpdateStatus(_("Ready"), 0, 0); wxMessageBox(_("Can't create directory ") + GetPackagePath(), _("Error"), wxICON_ERROR); return; } wxArrayString files; DevPakInstaller inst; if (inst.Install(rec->name, GetPackagePath() + rec->local_file, GetBasePath(), &files)) { // wxFileName fname(GetPackagePath() + rec->local_file); // fname.SetExt("entry"); // fname.SetName(rec->title); // CreateEntryFile(rec, fname.GetFullPath(), files); CreateEntryFile(rec, GetPackagePath() + rec->entry, files); wxMessageBox(_("DevPak installed"), _("Message"), wxICON_INFORMATION); // refresh installed_version rec->installed = true; rec->installed_version = rec->version; SetListColumnText(-1, 2, rec->installed_version); } else { wxMessageBox(_("DevPak was not installed.\nStatus:\n") + inst.GetStatus(), _("Error"), wxICON_ERROR); } UpdateStatus(_("Ready"), 0, 0); } void UpdateDlg::InstallMirrors(const wxString& file) { if (!wxCopyFile(file, GetMirrorsFilename(), true)) wxMessageBox(_("Can't install mirrors file: ") + file, _("Error"), wxICON_ERROR); else { wxRemoveFile(file); FillServers(); m_Net.SetServer(GetCurrentServer()); // update server based on mirrors wxMessageBox(_("Mirrors installed"), _("Information"), wxICON_INFORMATION); } } void UpdateDlg::UninstallFile() { UpdateStatus(_("Please wait...")); UpdateRec* rec = GetRecFromListView(); if (!rec) { wxMessageBox(_("No file selected!"), _("Error"), wxICON_ERROR); UpdateStatus(_("Ready"), 0, 0); return; } wxYield(); DevPakInstaller inst; if (inst.Uninstall(GetPackagePath() + rec->entry)) { wxMessageBox(_("DevPak uninstalled"), _("Message"), wxICON_INFORMATION); // refresh installed_version rec->installed_version.Clear(); rec->installed = false; SetListColumnText(-1, 2, rec->installed_version); } else { wxMessageBox(_("DevPak was not uninstalled.\nStatus:\n") + inst.GetStatus(), _("Error"), wxICON_ERROR); } } void UpdateDlg::CreateEntryFile(UpdateRec* rec, const wxString& filename, const wxArrayString& files) { wxString entry; entry << _T("[Setup]\n"); entry << _T("AppName=") << rec->name << _T("\n"); entry << _T("AppVersion=") << rec->version << _T("\n"); entry << _T("\n"); entry << _T("[Files]\n"); for (unsigned int i = 0; i < files.GetCount(); ++i) { entry << files[i] << _T("\n"); } wxFile f(filename, wxFile::write); if (f.IsOpened()) { f.Write(entry.mb_str(wxConvUTF8),entry.Length()); } } void UpdateDlg::OnFileRightClick(wxListEvent& event) { // LOGSTREAM << "pt.x=" << event.GetPoint().x << ", pt.y=" << event.GetPoint().y << '\n'; UpdateRec* rec = GetRecFromListView(); if (!rec) return; wxMenu popup; popup.Append(idPopupDownloadAndInstall, _("Download && install")); popup.AppendSeparator(); popup.Append(idPopupDownload, _("Download")); popup.Append(idPopupInstall, _("Install")); popup.AppendSeparator(); popup.Append(idPopupUninstall, _("Uninstall")); bool canDl = !rec->downloaded || rec->version != rec->installed_version; bool canInst = rec->downloaded && (!rec->installed || rec->version != rec->installed_version); popup.Enable(idPopupDownload, canDl); popup.Enable(idPopupInstall, canInst); popup.Enable(idPopupDownloadAndInstall, canInst || canDl); popup.Enable(idPopupUninstall, rec->installed); wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); lst->PopupMenu(&popup, event.GetPoint()); } void UpdateDlg::OnFileDeSelected(wxListEvent& event) { wxListItem id; FillFileDetails(id); EnableButtons(); } void UpdateDlg::OnFileSelected(wxListEvent& event) { FillFileDetails(event.GetItem()); EnableButtons(); } void UpdateDlg::OnTreeSelChanged(wxTreeEvent& event) { FillFiles(event.GetItem()); EnableButtons(); } void UpdateDlg::OnDownload(wxCommandEvent& event) { DownloadFile(true); } void UpdateDlg::OnInstall(wxCommandEvent& event) { InstallFile(); } void UpdateDlg::OnUninstall(wxCommandEvent& event) { UninstallFile(); } void UpdateDlg::OnDownloadAndInstall(wxCommandEvent& event) { DownloadFile(); } void UpdateDlg::OnServerChange(wxCommandEvent& event) { InternetUpdate(); } void UpdateDlg::OnFilterChange(wxCommandEvent& event) { ApplyFilter(); } void UpdateDlg::OnConnect(wxCommandEvent& event) { XRCCTRL(*this, "wxID_CANCEL", wxButton)->SetLabel(_("Abort")); EnableButtons(); } void UpdateDlg::OnDisConnect(wxCommandEvent& event) { XRCCTRL(*this, "wxID_CANCEL", wxButton)->SetLabel(_("Close")); EnableButtons(); } void UpdateDlg::OnProgress(wxCommandEvent& event) { int prg = -1; if (m_CurrFileSize != 0) prg = event.GetInt() * 100 / m_CurrFileSize; UpdateStatus(_("Downloading: ") + event.GetString(), prg); wxStaticText* lbl = XRCCTRL(*this, "lblProgress", wxStaticText); wxString msg; msg.Printf(_("%s of %s"), GetSizeString(event.GetInt()).c_str(), GetSizeString(m_CurrFileSize).c_str()); lbl->SetLabel(msg); } void UpdateDlg::OnAborted(wxCommandEvent& event) { UpdateStatus(_("Download aborted: ") + event.GetString(), 0, 0); XRCCTRL(*this, "lblProgress", wxStaticText)->SetLabel(_T("")); m_LastBlockSize = 0; } void UpdateDlg::OnDownloadStarted(wxCommandEvent& event) { m_CurrFileSize = event.GetInt(); UpdateStatus(_("Download started: ") + event.GetString(), 0, 100); XRCCTRL(*this, "lblProgress", wxStaticText)->SetLabel(_T("")); m_LastBlockSize = 0; } void UpdateDlg::OnDownloadEnded(wxCommandEvent& event) { UpdateStatus(_("Download finished: ") + event.GetString()); XRCCTRL(*this, "lblProgress", wxStaticText)->SetLabel(_T("")); m_LastBlockSize = 0; if (m_HasUpdated && event.GetInt() == 0) { UpdateRec* rec = GetRecFromListView(); if (rec) { if (rec->bytes != m_CurrFileSize) wxMessageBox(_("File size mismatch for ") + event.GetString() + _("!\n\n" "This, usually, means one of three things:\n" "1) The reported size in the update list is wrong. The DevPak might still be valid.\n" "2) The file's location returned a web error-page. Invalid DevPak...\n" "3) The file is corrupt...\n\n" "You can try to install it anyway. If it is not a valid DevPak, the operation will fail."), _("Warning"), wxICON_WARNING); } if (rec && rec->installable && wxMessageBox(_("Do you want to install ") + event.GetString() + _(" now?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxYES) InstallFile(); else if (rec && rec->title == _T("WebUpdate Mirrors list")) InstallMirrors(GetPackagePath() + rec->local_file); } m_CurrFileSize = 0; } void UpdateDlg::OnUpdateUI(wxUpdateUIEvent& event) { // hack to display the download message *after* the dialog has been shown... if (m_FirstTimeCheck) { m_FirstTimeCheck = false; // no more, just once wxString config = GetConfFilename(); if (wxFileExists(config)) InternetUpdate(); else { if (wxMessageBox(_("A list of updates needs to be downloaded.\nDo you want to do this now?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxYES) InternetUpdate(true); } } } python-patch-ng-1.17.4/tests/01uni_multi/[result]/updatedlg.h000066400000000000000000000052571363443050500241000ustar00rootroot00000000000000#ifndef UPDATEDLG_H #define UPDATEDLG_H #include #include #include #include "cbnetwork.h" #include "conf.h" class UpdateDlg : public wxDialog { public: UpdateDlg(wxWindow* parent); virtual ~UpdateDlg(); void EndModal(int retCode); protected: void OnFileSelected(wxListEvent& event); void OnFileDeSelected(wxListEvent& event); void OnFileRightClick(wxListEvent& event); void OnTreeSelChanged(wxTreeEvent& event); void OnDownload(wxCommandEvent& event); void OnInstall(wxCommandEvent& event); void OnUninstall(wxCommandEvent& event); void OnDownloadAndInstall(wxCommandEvent& event); void OnUpdate(wxCommandEvent& event); void OnServerChange(wxCommandEvent& event); void OnFilterChange(wxCommandEvent& event); void OnConnect(wxCommandEvent& event); void OnDisConnect(wxCommandEvent& event); void OnProgress(wxCommandEvent& event); void OnAborted(wxCommandEvent& event); void OnDownloadStarted(wxCommandEvent& event); void OnDownloadEnded(wxCommandEvent& event); void OnUpdateUI(wxUpdateUIEvent& event); private: void InternetUpdate(bool forceDownload = false); void DownloadFile(bool dontInstall = false); void InstallFile(); void UninstallFile(); void InstallMirrors(const wxString& file); void CreateEntryFile(UpdateRec* rec, const wxString& filename, const wxArrayString& files); void EnableButtons(bool update = true, bool abort = true); void FillServers(); void FillGroups(); void FillFiles(const wxTreeItemId& id); void FillFileDetails(const wxListItem& id); void UpdateStatus(const wxString& status, int curProgress = -1, int maxProgress = -1); UpdateRec* GetRecFromListView(); void CreateListColumns(); void AddRecordToList(UpdateRec* rec); wxString GetListColumnText(int idx, int col); void SetListColumnText(int idx, int col, const wxString& text); wxString GetConfFilename(); wxString GetMirrorsFilename() const; wxString GetCurrentServer() const; wxString GetBasePath() const; wxString GetPackagePath() const; bool FilterRec(UpdateRec* rec); void ApplyFilter(); UpdateRec* m_Recs; wxArrayString m_Servers; int m_RecsCount; int m_CurrFileSize; int m_LastBlockSize; // for bps bool m_HasUpdated; bool m_FirstTimeCheck; cbNetwork m_Net; DECLARE_EVENT_TABLE(); }; #endif // UPDATEDLG_H python-patch-ng-1.17.4/tests/01uni_multi/conf.cpp000066400000000000000000000072401363443050500215730ustar00rootroot00000000000000/* * This file is part of the Code::Blocks IDE and licensed under the GNU General Public License, version 3 * http://www.gnu.org/licenses/gpl-3.0.html * * $Revision: 4909 $ * $Id: conf.cpp 4909 2008-02-27 13:15:26Z mortenmacfly $ * $HeadURL: http://svn.berlios.de/svnroot/repos/codeblocks/tags/8.02/src/plugins/contrib/devpak_plugin/conf.cpp $ */ #include "conf.h" #include #include #include #include wxString g_MasterPath; wxString GetSizeString(int bytes) { wxString ret; float kilobytes = (float)bytes / 1024.0f; float megabytes = kilobytes / 1024.0f; if (megabytes >= 1.0f) ret.Printf(_("%.2f MB"), megabytes); else if (kilobytes >= 1.0f) ret.Printf(_("%.2f KB"), kilobytes); else ret.Printf(_("%ld bytes"), bytes); return ret; } UpdateRec* ReadConf(const IniParser& ini, int* recCount, const wxString& currentServer, const wxString& appPath) { *recCount = 0; int groupsCount = ini.GetGroupsCount(); if (groupsCount == 0) return 0; UpdateRec* list = new UpdateRec[ini.GetGroupsCount()]; for (int i = 0; i < groupsCount; ++i) { UpdateRec& rec = list[i]; rec.title = ini.GetGroupName(i); // fix title // devpaks.org has changed the title to contain some extra info // e.g.: [libunicows Library version: 1.1.1 Devpak revision: 1sid] // we don't need this extra info, so if we find it we remove it int pos = rec.title.Find(_T("Library version:")); if (pos != -1) { rec.title.Truncate(pos); rec.title = rec.title.Trim(false); rec.title = rec.title.Trim(true); } rec.name = ini.GetKeyValue(i, _T("Name")); rec.desc = ini.GetKeyValue(i, _T("Description")); rec.remote_file = ini.GetKeyValue(i, _T("RemoteFilename")); rec.local_file = ini.GetKeyValue(i, _T("LocalFilename")); rec.groups = GetArrayFromString(ini.GetKeyValue(i, _T("Group")), _T(",")); rec.install = ini.GetKeyValue(i, _T("InstallPath")); rec.version = ini.GetKeyValue(i, _T("Version")); ini.GetKeyValue(i, _T("Size")).ToLong(&rec.bytes); rec.date = ini.GetKeyValue(i, _T("Date")); rec.installable = ini.GetKeyValue(i, _T("Execute")) == _T("1"); // read .entry file (if exists) rec.entry = (!rec.name.IsEmpty() ? rec.name : wxFileName(rec.local_file).GetName()) + _T(".entry"); IniParser p; p.ParseFile(appPath + rec.entry); rec.installed_version = p.GetValue(_T("Setup"), _T("AppVersion")); rec.downloaded = wxFileExists(appPath + _T("/") + rec.local_file); rec.installed = !rec.installed_version.IsEmpty(); // calculate size rec.size = GetSizeString(rec.bytes); // fix-up if (rec.name.IsEmpty()) rec.name = rec.title; rec.desc.Replace(_T(""), _T("\n")); rec.desc.Replace(_T(""), _T("\r")); wxURL url(rec.remote_file); if (!url.GetServer().IsEmpty()) { rec.remote_server = url.GetScheme() + _T("://") + url.GetServer(); int pos = rec.remote_file.Find(url.GetServer()); if (pos != wxNOT_FOUND) rec.remote_file.Remove(0, pos + url.GetServer().Length() + 1); } else rec.remote_server = currentServer; } *recCount = groupsCount; return list; } UpdateRec* FindRecByTitle(const wxString& title, UpdateRec* list, int count) { for (int i = 0; i < count; ++i) { if (list[i].title == title) return &list[i]; } return 0; } python-patch-ng-1.17.4/tests/01uni_multi/conf.h000066400000000000000000000015531363443050500212410ustar00rootroot00000000000000#ifndef CONF_H #define CONF_H #include #include #include "cbiniparser.h" struct UpdateRec { wxString entry; wxString title; wxString name; wxString desc; wxString remote_server; wxString remote_file; wxString local_file; wxArrayString groups; wxString install; wxString version; wxString installed_version; long int bytes; float kilobytes; float megabytes; wxString size; wxString date; bool installable; bool downloaded; bool installed; }; extern wxString g_MasterPath; UpdateRec* ReadConf(const IniParser& ini, int* recCount, const wxString& currentServer, const wxString& appPath); UpdateRec* FindRecByTitle(const wxString& title, UpdateRec* list, int count); // utility wxString GetSizeString(int bytes); #endif // CONF_H python-patch-ng-1.17.4/tests/01uni_multi/manifest.xml000066400000000000000000000016531363443050500224740ustar00rootroot00000000000000 python-patch-ng-1.17.4/tests/01uni_multi/updatedlg.cpp000066400000000000000000000537321363443050500226260ustar00rootroot00000000000000/* * This file is part of the Code::Blocks IDE and licensed under the GNU General Public License, version 3 * http://www.gnu.org/licenses/gpl-3.0.html * * $Revision: 4909 $ * $Id: updatedlg.cpp 4909 2008-02-27 13:15:26Z mortenmacfly $ * $HeadURL: http://svn.berlios.de/svnroot/repos/codeblocks/tags/8.02/src/plugins/contrib/devpak_plugin/updatedlg.cpp $ */ #include "updatedlg.h" #include #include #include #include #include #include #include #include #include #include #include "devpakinstaller.h" #include "crc32.h" #include "manager.h" #include "configmanager.h" #include "globals.h" int idNet = wxNewId(); int idPopupInstall = wxNewId(); int idPopupDownload = wxNewId(); int idPopupDownloadAndInstall = wxNewId(); int idPopupUninstall = wxNewId(); BEGIN_EVENT_TABLE(UpdateDlg, wxDialog) EVT_UPDATE_UI(-1, UpdateDlg::OnUpdateUI) EVT_TREE_SEL_CHANGED(XRCID("tvCategories"), UpdateDlg::OnTreeSelChanged) EVT_LIST_ITEM_SELECTED(XRCID("lvFiles"), UpdateDlg::OnFileSelected) EVT_LIST_ITEM_DESELECTED(XRCID("lvFiles"), UpdateDlg::OnFileDeSelected) EVT_LIST_ITEM_RIGHT_CLICK(XRCID("lvFiles"), UpdateDlg::OnFileRightClick) EVT_MENU(idPopupDownload, UpdateDlg::OnDownload) EVT_MENU(idPopupDownloadAndInstall, UpdateDlg::OnDownloadAndInstall) EVT_MENU(idPopupInstall, UpdateDlg::OnInstall) EVT_MENU(idPopupUninstall, UpdateDlg::OnUninstall) EVT_COMBOBOX(XRCID("cmbServer"), UpdateDlg::OnServerChange) EVT_COMBOBOX(XRCID("cmbFilter"), UpdateDlg::OnFilterChange) EVT_CHECKBOX(XRCID("chkCache"), UpdateDlg::OnServerChange) EVT_CBNET_CONNECT(idNet, UpdateDlg::OnConnect) EVT_CBNET_DISCONNECT(idNet, UpdateDlg::OnDisConnect) EVT_CBNET_PROGRESS(idNet, UpdateDlg::OnProgress) EVT_CBNET_ABORTED(idNet, UpdateDlg::OnAborted) EVT_CBNET_START_DOWNLOAD(idNet, UpdateDlg::OnDownloadStarted) EVT_CBNET_END_DOWNLOAD(idNet, UpdateDlg::OnDownloadEnded) END_EVENT_TABLE() UpdateDlg::UpdateDlg(wxWindow* parent) : m_Recs(0), m_RecsCount(0), m_CurrFileSize(0), m_LastBlockSize(0), m_HasUpdated(false), m_FirstTimeCheck(true), m_Net(this, idNet, _T("http://devpaks.sourceforge.net/")) { //ctor wxXmlResource::Get()->LoadDialog(this, parent, _T("MainFrame")); CreateListColumns(); FillServers(); UpdateStatus(_("Ready"), 0); } UpdateDlg::~UpdateDlg() { //dtor delete[] m_Recs; m_RecsCount = 0; } void UpdateDlg::EndModal(int retCode) { if (!m_Net.IsConnected() || retCode != wxID_CANCEL) { wxDialog::EndModal(retCode); return; } if (m_Net.IsConnected()) m_Net.Abort(); } void UpdateDlg::CreateListColumns() { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); lst->InsertColumn(0, _("Title")); lst->InsertColumn(1, _("Version")); lst->InsertColumn(2, _("Installed")); lst->InsertColumn(3, _("Size"), wxLIST_FORMAT_RIGHT); lst->SetColumnWidth(0, lst->GetSize().x - (64 * 3) - 2); // 1st column takes all remaining space lst->SetColumnWidth(1, 64); lst->SetColumnWidth(2, 64); lst->SetColumnWidth(3, 64); } void UpdateDlg::AddRecordToList(UpdateRec* rec) { if (!rec) return; wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int idx = lst->GetItemCount(); lst->InsertItem(idx, rec->title); lst->SetItem(idx, 1, rec->version); lst->SetItem(idx, 2, rec->installed_version); lst->SetItem(idx, 3, rec->size); } void UpdateDlg::SetListColumnText(int idx, int col, const wxString& text) { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int index = idx == -1 ? lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) : idx; wxListItem it; it.m_itemId = index; it.m_col = col; it.m_mask = wxLIST_MASK_TEXT; it.m_text = text; lst->SetItem(it); } void UpdateDlg::UpdateStatus(const wxString& status, int curProgress, int maxProgress) { wxStaticText* lbl = XRCCTRL(*this, "lblStatus", wxStaticText); if (lbl->GetLabel() != status) lbl->SetLabel(status); if (curProgress != -1) XRCCTRL(*this, "gauProgress", wxGauge)->SetValue(curProgress); if (maxProgress != -1) XRCCTRL(*this, "gauProgress", wxGauge)->SetRange(maxProgress); } void UpdateDlg::EnableButtons(bool update, bool abort) { wxButton* btnCl = XRCCTRL(*this, "wxID_CANCEL", wxButton); btnCl->Enable(abort); // disable server list and cache checkbox while downloading XRCCTRL(*this, "cmbServer", wxComboBox)->Enable(!m_Net.IsConnected()); XRCCTRL(*this, "chkCache", wxCheckBox)->Enable(!m_Net.IsConnected()); wxYield(); } void UpdateDlg::FillGroups() { UpdateStatus(_("Parsing list of updates"), 0, m_RecsCount - 1); // get a list of unique group names wxArrayString groups; for (int i = 0; i < m_RecsCount; ++i) { for (unsigned int x = 0; x < m_Recs[i].groups.GetCount(); ++x) { if (m_Recs[i].groups[x].IsEmpty()) continue; if (groups.Index(m_Recs[i].groups[x]) == wxNOT_FOUND) { if (FilterRec(&m_Recs[i])) groups.Add(m_Recs[i].groups[x]); } } } // create the groups tree wxTreeCtrl* tree = XRCCTRL(*this, "tvCategories", wxTreeCtrl); tree->Freeze(); tree->DeleteAllItems(); wxTreeItemId root = tree->AddRoot(_("All categories")); for (unsigned int i = 0; i < groups.GetCount(); ++i) { tree->AppendItem(root, groups[i]); } tree->SortChildren(root); tree->Thaw(); tree->Expand(root); tree->SelectItem(root); // this calls the event UpdateStatus(_("Done parsing list of updates"), 0); } void UpdateDlg::FillFiles(const wxTreeItemId& id) { wxTreeCtrl* tree = XRCCTRL(*this, "tvCategories", wxTreeCtrl); wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); lst->Freeze(); lst->ClearAll(); CreateListColumns(); wxString group = id == tree->GetRootItem() ? _T("") : tree->GetItemText(id); // add files belonging to group int counter = 0; for (int i = 0; i < m_RecsCount; ++i) { if (group.IsEmpty() || (!m_Recs[i].groups.IsEmpty() && m_Recs[i].groups.Index(group) != wxNOT_FOUND)) { // filter if (FilterRec(&m_Recs[i])) { AddRecordToList(&m_Recs[i]); ++counter; } } } lst->Thaw(); // select first item lst->SetItemState(0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); } void UpdateDlg::FillFileDetails(const wxListItem& id) { wxTextCtrl* txt = XRCCTRL(*this, "txtInfo", wxTextCtrl); txt->Clear(); UpdateRec* cur = GetRecFromListView(); if (!cur) { txt->Clear(); EnableButtons(); return; } txt->AppendText(_("Name: ") + cur->name + _T("\n")); // txt->AppendText(_("Server: ") + cur->remote_server + _T("\n")); // txt->AppendText(_("File: ") + cur->remote_file + _T("\n")); txt->AppendText(_("Version: ") + cur->version + _T("\n")); txt->AppendText(_("Size: ") + cur->size + _T("\n")); txt->AppendText(_("Date: ") + cur->date + _T("\n\n")); txt->AppendText(_("Description: \n")); txt->AppendText(cur->desc); txt->SetSelection(0, 0); txt->SetInsertionPoint(0); } void UpdateDlg::InternetUpdate(bool forceDownload) { UpdateStatus(_("Please wait...")); m_HasUpdated = false; m_Net.SetServer(GetCurrentServer()); EnableButtons(false); forceDownload = forceDownload || !XRCCTRL(*this, "chkCache", wxCheckBox)->GetValue(); bool forceDownloadMirrors = forceDownload || !wxFileExists(GetMirrorsFilename()); if (forceDownloadMirrors) { if (!m_Net.DownloadFile(_T("mirrors.cfg"), GetMirrorsFilename())) { UpdateStatus(_("Error downloading list of mirrors"), 0, 0); return; } else { FillServers(); m_Net.SetServer(GetCurrentServer()); // update server based on mirrors } } wxString config = GetConfFilename(); forceDownload = forceDownload || !wxFileExists(config); if (forceDownload && !m_Net.DownloadFile(_T("webupdate.conf"), config)) { UpdateStatus(_("Error downloading list of updates"), 0, 0); return; } else { IniParser ini; if (!ini.ParseFile(config)) { UpdateStatus(_("Failed to retrieve the list of updates"), 0, 0); return; } ini.Sort(); if (m_Recs) delete[] m_Recs; // remember to delete[] m_Recs when we 're done with it!!! // it's our responsibility once given to us m_Recs = ReadConf(ini, &m_RecsCount, GetCurrentServer(), GetPackagePath()); FillGroups(); } EnableButtons(); UpdateStatus(_("Ready"), 0, 0); m_HasUpdated = true; } void UpdateDlg::FillServers() { wxComboBox* cmb = XRCCTRL(*this, "cmbServer", wxComboBox); cmb->Clear(); m_Servers.Clear(); IniParser ini; ini.ParseFile(GetMirrorsFilename()); int group = ini.FindGroupByName(_T("WebUpdate mirrors")); for (int i = 0; group != -1 && i < ini.GetKeysCount(group); ++i) { cmb->Append(ini.GetKeyName(group, i)); m_Servers.Add(ini.GetKeyValue(group, i)); } if (cmb->GetCount() == 0) { cmb->Append(_("devpaks.org Community Devpaks")); m_Servers.Add(_T("http://devpaks.sourceforge.net/")); } cmb->SetSelection(0); } wxString UpdateDlg::GetConfFilename() { int server_hash = GetTextCRC32(GetCurrentServer().mb_str()); wxString config; config = ConfigManager::GetConfigFolder() + wxFILE_SEP_PATH; config.Printf(_T("%sdevpak_%x.conf"), config.c_str(), server_hash); return config; } wxString UpdateDlg::GetMirrorsFilename() const { wxString config; config = ConfigManager::GetConfigFolder() + wxFILE_SEP_PATH + _T("devpak_mirrors.cfg"); return config; } wxString UpdateDlg::GetCurrentServer() const { return m_Servers[XRCCTRL(*this, "cmbServer", wxComboBox)->GetSelection()]; } wxString UpdateDlg::GetBasePath() const { return g_MasterPath + wxFILE_SEP_PATH; } wxString UpdateDlg::GetPackagePath() const { return GetBasePath() + _T("Packages") + wxFILE_SEP_PATH; } bool UpdateDlg::FilterRec(UpdateRec* rec) { if (!rec) return false; wxComboBox* cmb = XRCCTRL(*this, "cmbFilter", wxComboBox); switch (cmb->GetSelection()) { case 0: // All return true; case 1: // Installed return rec->installed; case 2: // installed with update available return rec->installed && rec->version != rec->installed_version; case 3: // downloaded but not installed return rec->downloaded && !rec->installed; case 4: // not installed return !rec->downloaded && !rec->installed; default: return false; } return false; // doesn't reach here } void UpdateDlg::ApplyFilter() { wxTreeCtrl* tree = XRCCTRL(*this, "tvCategories", wxTreeCtrl); FillGroups(); FillFiles(tree->GetSelection()); EnableButtons(); } UpdateRec* UpdateDlg::GetRecFromListView() { wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); int index = lst->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (index == -1) return 0; wxString title = lst->GetItemText(index); return FindRecByTitle(title, m_Recs, m_RecsCount); } void UpdateDlg::DownloadFile(bool dontInstall) { UpdateStatus(_("Please wait...")); UpdateRec* rec = GetRecFromListView(); if (!rec) { wxMessageBox(_("No file selected!"), _("Error"), wxICON_ERROR); UpdateStatus(_("Ready"), 0, 0); return; } if (rec->version == rec->installed_version) { if (wxMessageBox(_("You seem to have installed the latest version.\nAre you sure you want to proceed?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxNO) return; } if (!CreateDirRecursively(GetPackagePath())) { wxMessageBox(_("Can't create directory ") + GetPackagePath(), _("Error"), wxICON_ERROR); return; } if (wxFileExists(GetPackagePath() + rec->local_file)) { if (wxMessageBox(_("This file already exists!\nAre you sure you want to download it again?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxNO && rec->installable) { if (!dontInstall && wxMessageBox(_("Do you want to force-install it?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxYES) InstallFile(); return; } } m_Net.SetServer(rec->remote_server); EnableButtons(false); if (!m_Net.DownloadFile(rec->remote_file, GetPackagePath() + rec->local_file)) { rec->downloaded = false; UpdateStatus(_("Error downloading file: ") + rec->remote_server + _T(" > ") + rec->remote_file, 0, 0); return; } else rec->downloaded = true; UpdateStatus(_("Ready"), 0, 0); EnableButtons(); } void UpdateDlg::InstallFile() { UpdateStatus(_("Please wait...")); UpdateRec* rec = GetRecFromListView(); if (!rec) { wxMessageBox(_("No file selected!"), _("Error"), wxICON_ERROR); UpdateStatus(_("Ready"), 0, 0); return; } wxYield(); if (rec->title == _T("WebUpdate Mirrors list")) { InstallMirrors(GetPackagePath() + rec->local_file); rec->installed = true; ApplyFilter(); UpdateStatus(_("Ready"), 0, 0); return; } else if (!rec->installable) { UpdateStatus(_("Ready"), 0, 0); return; } if (!CreateDirRecursively(GetPackagePath())) { UpdateStatus(_("Ready"), 0, 0); wxMessageBox(_("Can't create directory ") + GetPackagePath(), _("Error"), wxICON_ERROR); return; } wxArrayString files; DevPakInstaller inst; if (inst.Install(rec->name, GetPackagePath() + rec->local_file, GetBasePath(), &files)) { // wxFileName fname(GetPackagePath() + rec->local_file); // fname.SetExt("entry"); // fname.SetName(rec->title); // CreateEntryFile(rec, fname.GetFullPath(), files); CreateEntryFile(rec, GetPackagePath() + rec->entry, files); wxMessageBox(_("DevPak installed"), _("Message"), wxICON_INFORMATION); // refresh installed_version rec->installed = true; rec->installed_version = rec->version; SetListColumnText(-1, 2, rec->installed_version); } else { wxMessageBox(_("DevPak was not installed.\nStatus:\n") + inst.GetStatus(), _("Error"), wxICON_ERROR); } UpdateStatus(_("Ready"), 0, 0); } void UpdateDlg::InstallMirrors(const wxString& file) { if (!wxCopyFile(file, GetMirrorsFilename(), true)) wxMessageBox(_("Can't install mirrors file: ") + file, _("Error"), wxICON_ERROR); else { wxRemoveFile(file); FillServers(); m_Net.SetServer(GetCurrentServer()); // update server based on mirrors wxMessageBox(_("Mirrors installed"), _("Information"), wxICON_INFORMATION); } } void UpdateDlg::UninstallFile() { UpdateStatus(_("Please wait...")); UpdateRec* rec = GetRecFromListView(); if (!rec) { wxMessageBox(_("No file selected!"), _("Error"), wxICON_ERROR); UpdateStatus(_("Ready"), 0, 0); return; } wxYield(); DevPakInstaller inst; if (inst.Uninstall(GetPackagePath() + rec->entry)) { wxMessageBox(_("DevPak uninstalled"), _("Message"), wxICON_INFORMATION); // refresh installed_version rec->installed_version.Clear(); rec->installed = false; SetListColumnText(-1, 2, rec->installed_version); } else { wxMessageBox(_("DevPak was not uninstalled.\nStatus:\n") + inst.GetStatus(), _("Error"), wxICON_ERROR); } } void UpdateDlg::CreateEntryFile(UpdateRec* rec, const wxString& filename, const wxArrayString& files) { wxString entry; entry << _T("[Setup]\n"); entry << _T("AppName=") << rec->name << _T("\n"); entry << _T("AppVersion=") << rec->version << _T("\n"); entry << _T("\n"); entry << _T("[Files]\n"); for (unsigned int i = 0; i < files.GetCount(); ++i) { entry << files[i] << _T("\n"); } wxFile f(filename, wxFile::write); if (f.IsOpened()) { f.Write(entry.mb_str(wxConvUTF8),entry.Length()); } } void UpdateDlg::OnFileRightClick(wxListEvent& event) { // LOGSTREAM << "pt.x=" << event.GetPoint().x << ", pt.y=" << event.GetPoint().y << '\n'; UpdateRec* rec = GetRecFromListView(); if (!rec) return; wxMenu popup; popup.Append(idPopupDownloadAndInstall, _("Download && install")); popup.AppendSeparator(); popup.Append(idPopupDownload, _("Download")); popup.Append(idPopupInstall, _("Install")); popup.AppendSeparator(); popup.Append(idPopupUninstall, _("Uninstall")); bool canDl = !rec->downloaded || rec->version != rec->installed_version; bool canInst = rec->downloaded && (!rec->installed || rec->version != rec->installed_version); popup.Enable(idPopupDownload, canDl); popup.Enable(idPopupInstall, canInst); popup.Enable(idPopupDownloadAndInstall, canInst || canDl); popup.Enable(idPopupUninstall, rec->installed); wxListCtrl* lst = XRCCTRL(*this, "lvFiles", wxListCtrl); lst->PopupMenu(&popup, event.GetPoint()); } void UpdateDlg::OnFileDeSelected(wxListEvent& event) { wxListItem id; FillFileDetails(id); EnableButtons(); } void UpdateDlg::OnFileSelected(wxListEvent& event) { FillFileDetails(event.GetItem()); EnableButtons(); } void UpdateDlg::OnTreeSelChanged(wxTreeEvent& event) { FillFiles(event.GetItem()); EnableButtons(); } void UpdateDlg::OnDownload(wxCommandEvent& event) { DownloadFile(true); } void UpdateDlg::OnInstall(wxCommandEvent& event) { InstallFile(); } void UpdateDlg::OnUninstall(wxCommandEvent& event) { UninstallFile(); } void UpdateDlg::OnDownloadAndInstall(wxCommandEvent& event) { DownloadFile(); } void UpdateDlg::OnServerChange(wxCommandEvent& event) { InternetUpdate(); } void UpdateDlg::OnFilterChange(wxCommandEvent& event) { ApplyFilter(); } void UpdateDlg::OnConnect(wxCommandEvent& event) { XRCCTRL(*this, "wxID_CANCEL", wxButton)->SetLabel(_("Abort")); EnableButtons(); } void UpdateDlg::OnDisConnect(wxCommandEvent& event) { XRCCTRL(*this, "wxID_CANCEL", wxButton)->SetLabel(_("Close")); EnableButtons(); } void UpdateDlg::OnProgress(wxCommandEvent& event) { int prg = -1; if (m_CurrFileSize != 0) prg = event.GetInt() * 100 / m_CurrFileSize; UpdateStatus(_("Downloading: ") + event.GetString(), prg); wxStaticText* lbl = XRCCTRL(*this, "lblProgress", wxStaticText); wxString msg; msg.Printf(_("%s of %s"), GetSizeString(event.GetInt()).c_str(), GetSizeString(m_CurrFileSize).c_str()); lbl->SetLabel(msg); } void UpdateDlg::OnAborted(wxCommandEvent& event) { UpdateStatus(_("Download aborted: ") + event.GetString(), 0, 0); XRCCTRL(*this, "lblProgress", wxStaticText)->SetLabel(_T("")); m_LastBlockSize = 0; } void UpdateDlg::OnDownloadStarted(wxCommandEvent& event) { m_CurrFileSize = event.GetInt(); UpdateStatus(_("Download started: ") + event.GetString(), 0, 100); XRCCTRL(*this, "lblProgress", wxStaticText)->SetLabel(_T("")); m_LastBlockSize = 0; } void UpdateDlg::OnDownloadEnded(wxCommandEvent& event) { UpdateStatus(_("Download finished: ") + event.GetString()); XRCCTRL(*this, "lblProgress", wxStaticText)->SetLabel(_T("")); m_LastBlockSize = 0; if (m_HasUpdated && event.GetInt() == 0) { UpdateRec* rec = GetRecFromListView(); if (rec) { if (rec->bytes != m_CurrFileSize) wxMessageBox(_("File size mismatch for ") + event.GetString() + _("!\n\n" "This, usually, means one of three things:\n" "1) The reported size in the update list is wrong. The DevPak might still be valid.\n" "2) The file's location returned a web error-page. Invalid DevPak...\n" "3) The file is corrupt...\n\n" "You can try to install it anyway. If it is not a valid DevPak, the operation will fail."), _("Warning"), wxICON_WARNING); } if (rec && rec->installable && wxMessageBox(_("Do you want to install ") + event.GetString() + _(" now?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxYES) InstallFile(); else if (rec && rec->title == _T("WebUpdate Mirrors list")) InstallMirrors(GetPackagePath() + rec->local_file); } m_CurrFileSize = 0; } void UpdateDlg::OnUpdateUI(wxUpdateUIEvent& event) { // hack to display the download message *after* the dialog has been shown... if (m_FirstTimeCheck) { m_FirstTimeCheck = false; // no more, just once wxString config = GetConfFilename(); if (wxFileExists(config)) InternetUpdate(); else { if (wxMessageBox(_("A list of updates needs to be downloaded.\nDo you want to do this now?"), _("Confirmation"), wxICON_QUESTION | wxYES_NO) == wxYES) InternetUpdate(true); } } } python-patch-ng-1.17.4/tests/01uni_multi/updatedlg.h000066400000000000000000000051701363443050500222640ustar00rootroot00000000000000#ifndef UPDATEDLG_H #define UPDATEDLG_H #include #include #include #include "cbnetwork.h" #include "conf.h" class UpdateDlg : public wxDialog { public: UpdateDlg(wxWindow* parent); virtual ~UpdateDlg(); void EndModal(int retCode); protected: void OnFileSelected(wxListEvent& event); void OnFileDeSelected(wxListEvent& event); void OnFileRightClick(wxListEvent& event); void OnTreeSelChanged(wxTreeEvent& event); void OnDownload(wxCommandEvent& event); void OnInstall(wxCommandEvent& event); void OnUninstall(wxCommandEvent& event); void OnDownloadAndInstall(wxCommandEvent& event); void OnUpdate(wxCommandEvent& event); void OnServerChange(wxCommandEvent& event); void OnFilterChange(wxCommandEvent& event); void OnConnect(wxCommandEvent& event); void OnDisConnect(wxCommandEvent& event); void OnProgress(wxCommandEvent& event); void OnAborted(wxCommandEvent& event); void OnDownloadStarted(wxCommandEvent& event); void OnDownloadEnded(wxCommandEvent& event); void OnUpdateUI(wxUpdateUIEvent& event); private: void InternetUpdate(bool forceDownload = false); void DownloadFile(bool dontInstall = false); void InstallFile(); void UninstallFile(); void InstallMirrors(const wxString& file); void CreateEntryFile(UpdateRec* rec, const wxString& filename, const wxArrayString& files); void EnableButtons(bool update = true, bool abort = true); void FillServers(); void FillGroups(); void FillFiles(const wxTreeItemId& id); void FillFileDetails(const wxListItem& id); void UpdateStatus(const wxString& status, int curProgress = -1, int maxProgress = -1); UpdateRec* GetRecFromListView(); void CreateListColumns(); void AddRecordToList(UpdateRec* rec); void SetListColumnText(int idx, int col, const wxString& text); wxString GetConfFilename(); wxString GetMirrorsFilename() const; wxString GetCurrentServer() const; wxString GetBasePath() const; wxString GetPackagePath() const; bool FilterRec(UpdateRec* rec); void ApplyFilter(); UpdateRec* m_Recs; wxArrayString m_Servers; int m_RecsCount; int m_CurrFileSize; int m_LastBlockSize; // for bps bool m_HasUpdated; bool m_FirstTimeCheck; cbNetwork m_Net; DECLARE_EVENT_TABLE(); }; #endif // UPDATEDLG_H python-patch-ng-1.17.4/tests/02uni_newline.from000066400000000000000000000000571363443050500213360ustar00rootroot00000000000000 read_patch("fix_devpak_install.patch") asdpython-patch-ng-1.17.4/tests/02uni_newline.patch000066400000000000000000000003051363443050500214660ustar00rootroot00000000000000--- 02uni_newline.from 2008-07-02 18:34:04 +0000 +++ 02uni_newline.to 2008-07-02 18:34:08 +0000 @@ -1,4 +1,3 @@ read_patch("fix_devpak_install.patch") -asd \ No newline at end of file python-patch-ng-1.17.4/tests/02uni_newline.to000066400000000000000000000000541363443050500210120ustar00rootroot00000000000000 read_patch("fix_devpak_install.patch") python-patch-ng-1.17.4/tests/03trail_fname.from000066400000000000000000000002161363443050500213010ustar00rootroot00000000000000Tests: - file not found - trailing spaces in patch filenames - already patched - create new files - remove files - svn diff - hg diff python-patch-ng-1.17.4/tests/03trail_fname.patch000066400000000000000000000003421363443050500214350ustar00rootroot00000000000000--- 03trail_fname.from +++ 03trail_fname.to @@ -1,7 +1,8 @@ Tests: - file not found -- trailing spaces in patch filenames - already patched + +Features: - create new files - remove files - svn diff python-patch-ng-1.17.4/tests/03trail_fname.to000066400000000000000000000001651363443050500207630ustar00rootroot00000000000000Tests: - file not found - already patched Features: - create new files - remove files - svn diff - hg diff python-patch-ng-1.17.4/tests/04can_patch.from000066400000000000000000000003601363443050500207410ustar00rootroot00000000000000beta beta beta beta beta beta beta alpha beta beta beta beta beta beta beta beta beta beta alpha beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta betapython-patch-ng-1.17.4/tests/04can_patch.patch000066400000000000000000000002461363443050500211000ustar00rootroot00000000000000--- 04can_patch.from Sun Dec 27 09:53:51 2009 +++ 04can_patch.to Sun Dec 27 09:54:06 2009 @@ -6,8 +6,6 @@ beta beta alpha -beta -beta beta beta beta python-patch-ng-1.17.4/tests/04can_patch.to000066400000000000000000000003441363443050500204220ustar00rootroot00000000000000beta beta beta beta beta beta beta alpha beta beta beta beta beta beta beta beta alpha beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta beta betapython-patch-ng-1.17.4/tests/05hg_change.from000066400000000000000000000216611363443050500207340ustar00rootroot00000000000000""" TestSuite Files/directories that comprise one test all have the same name, but a different extensions: *.patch *.from *.to *.doctest - self contained doctest patch TODO: recheck input/output sources == Code Coverage == To refresh code coverage stats, get 'coverage' tool from http://pypi.python.org/pypi/coverage/ and run this file with: coverage run run_tests.py coverage html -d coverage On Windows it may be more convenient instead of `coverage` call `python -m coverage.__main__` """ import os import sys import re import shutil import unittest import copy from os import listdir from os.path import abspath, dirname, exists, join, isdir from tempfile import mkdtemp verbose = False if "-v" in sys.argv or "--verbose" in sys.argv: verbose = True #: full path for directory with tests tests_dir = dirname(abspath(__file__)) # import patch_ng.py from parent directory save_path = sys.path sys.path.insert(0, dirname(tests_dir)) import patch_ng sys.path = save_path # ---------------------------------------------------------------------------- class TestPatchFiles(unittest.TestCase): """ unittest hack - test* methods are generated by add_test_methods() function below dynamicallt using information about *.patch files from tests directory """ def _assert_files_equal(self, file1, file2): f1 = f2 = None try: f1 = open(file1, "rb") f2 = open(file2, "rb") for line in f1: self.assertEqual(line, f2.readline()) finally: if f2: f2.close() if f1: f1.close() def _assert_dirs_equal(self, dir1, dir2, ignore=[]): """ compare dir1 with reference dir2 .svn dirs are ignored """ # recursion here e2list = listdir(dir2) for e1 in listdir(dir1): if e1 == ".svn": continue e1path = join(dir1, e1) e2path = join(dir2, e1) self.assert_(exists(e1path)) self.assert_(exists(e2path), "%s does not exist" % e2path) self.assert_(isdir(e1path) == isdir(e2path)) if not isdir(e1path): self._assert_files_equal(e1path, e2path) else: self._assert_dirs_equal(e1path, e2path) e2list.remove(e1) for e2 in e2list: if e2 == ".svn" or e2 in ignore: continue self.fail("extra file or directory: %s" % e2) def _run_test(self, testname): """ boilerplate for running *.patch file tests """ # 1. create temp test directory # 2. copy files # 3. execute file-based patch # 4. compare results # 5. cleanup on success tmpdir = mkdtemp(prefix="%s."%testname) patch_file = join(tmpdir, "%s.patch" % testname) shutil.copy(join(tests_dir, "%s.patch" % testname), patch_file) from_src = join(tests_dir, "%s.from" % testname) from_tgt = join(tmpdir, "%s.from" % testname) if not isdir(from_src): shutil.copy(from_src, from_tgt) else: for e in listdir(from_src): if e == ".svn": continue epath = join(from_src, e) if not isdir(epath): shutil.copy(epath, join(tmpdir, e)) else: shutil.copytree(epath, join(tmpdir, e)) # 3. # test utility as a whole patch_tool = join(dirname(tests_dir), "patch_ng.py") save_cwd = os.getcwdu() os.chdir(tmpdir) if verbose: cmd = '%s %s "%s"' % (sys.executable, patch_tool, patch_file) print "\n"+cmd else: cmd = '%s %s -q "%s"' % (sys.executable, patch_tool, patch_file) ret = os.system(cmd) assert ret == 0, "Error %d running test %s" % (ret, testname) os.chdir(save_cwd) # 4. # compare results if not isdir(from_src): self._assert_files_equal(join(tests_dir, "%s.to" % testname), from_tgt) else: # need recursive compare self._assert_dirs_equal(join(tests_dir, "%s.to" % testname), tmpdir, "%s.patch" % testname) shutil.rmtree(tmpdir) return 0 def add_test_methods(cls): """ hack to generate test* methods in target class - one for each *.patch file in tests directory """ # list testcases - every test starts with number # and add them as test* methods testptn = re.compile(r"^(?P\d{2,}.+)\.(?P[^\.]+)") testset = sorted( set([testptn.match(e).group('name') for e in listdir(tests_dir) if testptn.match(e)]) ) for filename in testset: methname = filename.replace(" ", "_") def create_closure(): name = filename return lambda self: self._run_test(name) setattr(cls, "test%s" % methname, create_closure()) if verbose: print "added test method %s to %s" % (methname, cls) add_test_methods(TestPatchFiles) # ---------------------------------------------------------------------------- class TestCheckPatched(unittest.TestCase): def setUp(self): self.save_cwd = os.getcwdu() os.chdir(tests_dir) def tearDown(self): os.chdir(self.save_cwd) def test_patched_multiline(self): pto = patch.fromfile("01uni_multi.patch") os.chdir(join(tests_dir, "01uni_multi.to")) self.assert_(pto.can_patch("updatedlg.cpp")) def test_can_patch_single_source(self): pto2 = patch.fromfile("02uni_newline.patch") self.assert_(pto2.can_patch("02uni_newline.from")) def test_can_patch_fails_on_target_file(self): pto3 = patch.fromfile("03trail_fname.patch") self.assertEqual(None, pto3.can_patch("03trail_fname.to")) self.assertEqual(None, pto3.can_patch("not_in_source.also")) def test_multiline_false_on_other_file(self): pto = patch.fromfile("01uni_multi.patch") os.chdir(join(tests_dir, "01uni_multi.from")) self.assertFalse(pto.can_patch("updatedlg.cpp")) def test_single_false_on_other_file(self): pto3 = patch.fromfile("03trail_fname.patch") self.assertFalse(pto3.can_patch("03trail_fname.from")) def test_can_patch_checks_source_filename_even_if_target_can_be_patched(self): pto2 = patch.fromfile("04can_patch.patch") self.assertFalse(pto2.can_patch("04can_patch.to")) # ---------------------------------------------------------------------------- class TestPatchParse(unittest.TestCase): def test_fromstring(self): try: f = open(join(tests_dir, "01uni_multi.patch"), "rb") readstr = f.read() finally: f.close() pst = patch.fromstring(readstr) self.assertEqual(len(pst), 5) def test_no_header_for_plain_diff_with_single_file(self): pto = patch.fromfile(join(tests_dir, "03trail_fname.patch")) self.assertEqual(pto.items[0].header, []) def test_header_for_second_file_in_svn_diff(self): pto = patch.fromfile(join(tests_dir, "01uni_multi.patch")) self.assertEqual(pto.items[1].header[0], 'Index: updatedlg.h\r\n') self.assert_(pto.items[1].header[1].startswith('=====')) def test_fail_missing_hunk_line(self): fp = open(join(tests_dir, "data/failing/missing-hunk-line.diff")) pto = patch.PatchSet() self.assertNotEqual(pto.parse(fp), True) fp.close() def test_fail_absolute_path(self): fp = open(join(tests_dir, "data/failing/absolute-path.diff")) res = patch.PatchSet().parse(fp) self.assertFalse(res) fp.close() def test_fail_parent_path(self): fp = open(join(tests_dir, "data/failing/parent-path.diff")) res = patch.PatchSet().parse(fp) self.assertFalse(res) fp.close() class TestPatchSetDetect(unittest.TestCase): def test_svn_detected(self): pto = patch.fromfile(join(tests_dir, "01uni_multi.patch")) self.assertEqual(pto.type, patch.SVN) def test_hg_detected(self): pto = patch.fromfile(join(tests_dir, "data/hg-added-file.diff")) self.assertEqual(pto.type, patch.HG) class TestPatchApply(unittest.TestCase): def setUp(self): self.save_cwd = os.getcwdu() self.tmpdir = mkdtemp(prefix=self.__class__.__name__) os.chdir(self.tmpdir) def tearDown(self): os.chdir(self.save_cwd) shutil.rmtree(self.tmpdir) def tmpcopy(self, filenames): """copy file(s) from test_dir to self.tmpdir""" for f in filenames: shutil.copy(join(tests_dir, f), self.tmpdir) def test_apply_returns_false_of_failure(self): self.tmpcopy(['data/failing/non-empty-patch-for-empty-file.diff', 'data/failing/upload.py']) pto = patch.fromfile('non-empty-patch-for-empty-file.diff') self.assertFalse(pto.apply()) def test_apply_returns_true_on_success(self): self.tmpcopy(['03trail_fname.patch', '03trail_fname.from']) pto = patch.fromfile('03trail_fname.patch') self.assert_(pto.apply()) # ---------------------------------------------------------------------------- if __name__ == '__main__': unittest.main() python-patch-ng-1.17.4/tests/05hg_change.patch000066400000000000000000000010731363443050500210630ustar00rootroot00000000000000diff -r 603f07175741 05hg_change.from --- a/05hg_change.from Wed Mar 16 08:21:44 2011 +0200 +++ b/05hg_change.to Wed Mar 16 10:08:57 2011 +0200 @@ -262,6 +262,10 @@ pto = patch.fromfile(join(tests_dir, "data/hg-added-file.diff")) self.assertEqual(pto.type, patch.HG) + def test_git_changed_detected(self): + pto = patch.fromfile(join(tests_dir, "data/git-changed-file.diff")) + self.assertEqual(pto.type, patch.GIT) + class TestPatchApply(unittest.TestCase): def setUp(self): self.save_cwd = os.getcwdu() python-patch-ng-1.17.4/tests/05hg_change.to000066400000000000000000000221251363443050500204070ustar00rootroot00000000000000""" TestSuite Files/directories that comprise one test all have the same name, but a different extensions: *.patch *.from *.to *.doctest - self contained doctest patch TODO: recheck input/output sources == Code Coverage == To refresh code coverage stats, get 'coverage' tool from http://pypi.python.org/pypi/coverage/ and run this file with: coverage run run_tests.py coverage html -d coverage On Windows it may be more convenient instead of `coverage` call `python -m coverage.__main__` """ import os import sys import re import shutil import unittest import copy from os import listdir from os.path import abspath, dirname, exists, join, isdir from tempfile import mkdtemp verbose = False if "-v" in sys.argv or "--verbose" in sys.argv: verbose = True #: full path for directory with tests tests_dir = dirname(abspath(__file__)) # import patch_ng.py from parent directory save_path = sys.path sys.path.insert(0, dirname(tests_dir)) import patch_ng sys.path = save_path # ---------------------------------------------------------------------------- class TestPatchFiles(unittest.TestCase): """ unittest hack - test* methods are generated by add_test_methods() function below dynamicallt using information about *.patch files from tests directory """ def _assert_files_equal(self, file1, file2): f1 = f2 = None try: f1 = open(file1, "rb") f2 = open(file2, "rb") for line in f1: self.assertEqual(line, f2.readline()) finally: if f2: f2.close() if f1: f1.close() def _assert_dirs_equal(self, dir1, dir2, ignore=[]): """ compare dir1 with reference dir2 .svn dirs are ignored """ # recursion here e2list = listdir(dir2) for e1 in listdir(dir1): if e1 == ".svn": continue e1path = join(dir1, e1) e2path = join(dir2, e1) self.assert_(exists(e1path)) self.assert_(exists(e2path), "%s does not exist" % e2path) self.assert_(isdir(e1path) == isdir(e2path)) if not isdir(e1path): self._assert_files_equal(e1path, e2path) else: self._assert_dirs_equal(e1path, e2path) e2list.remove(e1) for e2 in e2list: if e2 == ".svn" or e2 in ignore: continue self.fail("extra file or directory: %s" % e2) def _run_test(self, testname): """ boilerplate for running *.patch file tests """ # 1. create temp test directory # 2. copy files # 3. execute file-based patch # 4. compare results # 5. cleanup on success tmpdir = mkdtemp(prefix="%s."%testname) patch_file = join(tmpdir, "%s.patch" % testname) shutil.copy(join(tests_dir, "%s.patch" % testname), patch_file) from_src = join(tests_dir, "%s.from" % testname) from_tgt = join(tmpdir, "%s.from" % testname) if not isdir(from_src): shutil.copy(from_src, from_tgt) else: for e in listdir(from_src): if e == ".svn": continue epath = join(from_src, e) if not isdir(epath): shutil.copy(epath, join(tmpdir, e)) else: shutil.copytree(epath, join(tmpdir, e)) # 3. # test utility as a whole patch_tool = join(dirname(tests_dir), "patch_ng.py") save_cwd = os.getcwdu() os.chdir(tmpdir) if verbose: cmd = '%s %s "%s"' % (sys.executable, patch_tool, patch_file) print "\n"+cmd else: cmd = '%s %s -q "%s"' % (sys.executable, patch_tool, patch_file) ret = os.system(cmd) assert ret == 0, "Error %d running test %s" % (ret, testname) os.chdir(save_cwd) # 4. # compare results if not isdir(from_src): self._assert_files_equal(join(tests_dir, "%s.to" % testname), from_tgt) else: # need recursive compare self._assert_dirs_equal(join(tests_dir, "%s.to" % testname), tmpdir, "%s.patch" % testname) shutil.rmtree(tmpdir) return 0 def add_test_methods(cls): """ hack to generate test* methods in target class - one for each *.patch file in tests directory """ # list testcases - every test starts with number # and add them as test* methods testptn = re.compile(r"^(?P\d{2,}.+)\.(?P[^\.]+)") testset = sorted( set([testptn.match(e).group('name') for e in listdir(tests_dir) if testptn.match(e)]) ) for filename in testset: methname = filename.replace(" ", "_") def create_closure(): name = filename return lambda self: self._run_test(name) setattr(cls, "test%s" % methname, create_closure()) if verbose: print "added test method %s to %s" % (methname, cls) add_test_methods(TestPatchFiles) # ---------------------------------------------------------------------------- class TestCheckPatched(unittest.TestCase): def setUp(self): self.save_cwd = os.getcwdu() os.chdir(tests_dir) def tearDown(self): os.chdir(self.save_cwd) def test_patched_multiline(self): pto = patch.fromfile("01uni_multi.patch") os.chdir(join(tests_dir, "01uni_multi.to")) self.assert_(pto.can_patch("updatedlg.cpp")) def test_can_patch_single_source(self): pto2 = patch.fromfile("02uni_newline.patch") self.assert_(pto2.can_patch("02uni_newline.from")) def test_can_patch_fails_on_target_file(self): pto3 = patch.fromfile("03trail_fname.patch") self.assertEqual(None, pto3.can_patch("03trail_fname.to")) self.assertEqual(None, pto3.can_patch("not_in_source.also")) def test_multiline_false_on_other_file(self): pto = patch.fromfile("01uni_multi.patch") os.chdir(join(tests_dir, "01uni_multi.from")) self.assertFalse(pto.can_patch("updatedlg.cpp")) def test_single_false_on_other_file(self): pto3 = patch.fromfile("03trail_fname.patch") self.assertFalse(pto3.can_patch("03trail_fname.from")) def test_can_patch_checks_source_filename_even_if_target_can_be_patched(self): pto2 = patch.fromfile("04can_patch.patch") self.assertFalse(pto2.can_patch("04can_patch.to")) # ---------------------------------------------------------------------------- class TestPatchParse(unittest.TestCase): def test_fromstring(self): try: f = open(join(tests_dir, "01uni_multi.patch"), "rb") readstr = f.read() finally: f.close() pst = patch.fromstring(readstr) self.assertEqual(len(pst), 5) def test_no_header_for_plain_diff_with_single_file(self): pto = patch.fromfile(join(tests_dir, "03trail_fname.patch")) self.assertEqual(pto.items[0].header, []) def test_header_for_second_file_in_svn_diff(self): pto = patch.fromfile(join(tests_dir, "01uni_multi.patch")) self.assertEqual(pto.items[1].header[0], 'Index: updatedlg.h\r\n') self.assert_(pto.items[1].header[1].startswith('=====')) def test_fail_missing_hunk_line(self): fp = open(join(tests_dir, "data/failing/missing-hunk-line.diff")) pto = patch.PatchSet() self.assertNotEqual(pto.parse(fp), True) fp.close() def test_fail_absolute_path(self): fp = open(join(tests_dir, "data/failing/absolute-path.diff")) res = patch.PatchSet().parse(fp) self.assertFalse(res) fp.close() def test_fail_parent_path(self): fp = open(join(tests_dir, "data/failing/parent-path.diff")) res = patch.PatchSet().parse(fp) self.assertFalse(res) fp.close() class TestPatchSetDetect(unittest.TestCase): def test_svn_detected(self): pto = patch.fromfile(join(tests_dir, "01uni_multi.patch")) self.assertEqual(pto.type, patch.SVN) def test_hg_detected(self): pto = patch.fromfile(join(tests_dir, "data/hg-added-file.diff")) self.assertEqual(pto.type, patch.HG) def test_git_changed_detected(self): pto = patch.fromfile(join(tests_dir, "data/git-changed-file.diff")) self.assertEqual(pto.type, patch.GIT) class TestPatchApply(unittest.TestCase): def setUp(self): self.save_cwd = os.getcwdu() self.tmpdir = mkdtemp(prefix=self.__class__.__name__) os.chdir(self.tmpdir) def tearDown(self): os.chdir(self.save_cwd) shutil.rmtree(self.tmpdir) def tmpcopy(self, filenames): """copy file(s) from test_dir to self.tmpdir""" for f in filenames: shutil.copy(join(tests_dir, f), self.tmpdir) def test_apply_returns_false_of_failure(self): self.tmpcopy(['data/failing/non-empty-patch-for-empty-file.diff', 'data/failing/upload.py']) pto = patch.fromfile('non-empty-patch-for-empty-file.diff') self.assertFalse(pto.apply()) def test_apply_returns_true_on_success(self): self.tmpcopy(['03trail_fname.patch', '03trail_fname.from']) pto = patch.fromfile('03trail_fname.patch') self.assert_(pto.apply()) # ---------------------------------------------------------------------------- if __name__ == '__main__': unittest.main() python-patch-ng-1.17.4/tests/06nested/000077500000000000000000000000001363443050500174215ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/.hgignore000066400000000000000000000001641363443050500212250ustar00rootroot00000000000000syntax: glob *.pyc *.pyo build pyglet.*.log *.orig .DS_Store doc/api doc/_build doc/internal/build.rst website/dist python-patch-ng-1.17.4/tests/06nested/06nested.patch000066400000000000000000000072751363443050500221050ustar00rootroot00000000000000diff -r dcee1189d959 .hgignore --- a/.hgignore Tue Oct 23 01:05:32 2012 +0300 +++ b/.hgignore Mon Dec 03 11:32:26 2012 +0300 @@ -5,6 +5,7 @@ pyglet.*.log *.orig .DS_Store +_htmlapi doc/api doc/_build doc/internal/build.rst diff -r dcee1189d959 examples/font_comparison.py --- a/examples/font_comparison.py Tue Oct 23 01:05:32 2012 +0300 +++ b/examples/font_comparison.py Mon Dec 03 10:06:28 2012 +0300 @@ -45,13 +45,14 @@ FONTS = ['Andale Mono', 'Consolas', 'Inconsolata', 'Inconsolata-dz', 'Monaco', 'Menlo'] -SAMPLE = '''class Spam(object): - def __init__(self): - # The quick brown fox - self.spam = {"jumped": 'over'} +SAMPLE = '''\ +class Spam(object): + def __init__(self): + # The quick brown fox + self.spam = {"jumped": 'over'} @the - def lazy(self, *dog): - self.dog = [lazy, lazy]''' + def lazy(self, *dog): + self.dog = [lazy, lazy]''' class Window(pyglet.window.Window): font_num = 0 diff -r dcee1189d959 experimental/console.py --- a/experimental/console.py Tue Oct 23 01:05:32 2012 +0300 +++ b/experimental/console.py Mon Dec 03 10:06:28 2012 +0300 @@ -18,7 +18,7 @@ class Console(object): def __init__(self, width, height, globals=None, locals=None): - self.font = pyglet.text.default_font_factory.get_font('bitstream vera sans mono', 12) + self.font = pyglet.font.load('bitstream vera sans mono', 12) self.lines = [] self.buffer = '' self.pre_buffer = '' @@ -29,7 +29,7 @@ self.write_pending = '' self.width, self.height = (width, height) - self.max_lines = self.height / self.font.glyph_height - 1 + self.max_lines = self.height / (self.font.ascent - self.font.descent) - 1 self.write('pyglet command console\n') self.write('Version %s\n' % __version__) diff -r dcee1189d959 pyglet/font/win32.py --- a/pyglet/font/win32.py Tue Oct 23 01:05:32 2012 +0300 +++ b/pyglet/font/win32.py Mon Dec 03 10:06:28 2012 +0300 @@ -45,6 +45,7 @@ from sys import byteorder import pyglet from pyglet.font import base +from pyglet.font import win32query import pyglet.image from pyglet.libs.win32.constants import * from pyglet.libs.win32.types import * @@ -262,9 +263,7 @@ @classmethod def have_font(cls, name): - # CreateFontIndirect always returns a font... have to work out - # something with EnumFontFamily... TODO - return True + return win32query.have_font(name) @classmethod def add_font_data(cls, data): diff -r dcee1189d959 tests/app/EVENT_LOOP.py --- a/tests/app/EVENT_LOOP.py Tue Oct 23 01:05:32 2012 +0300 +++ b/tests/app/EVENT_LOOP.py Mon Dec 03 10:06:28 2012 +0300 @@ -21,8 +21,8 @@ class EVENT_LOOP(unittest.TestCase): def t_scheduled(self, interval, iterations, sleep_time=0): - print 'Test interval=%s, iterations=%s, sleep=%s' % (interval, - iterations, sleep_time) + print('Test interval=%s, iterations=%s, sleep=%s' % (interval, + iterations, sleep_time)) warmup_iterations = iterations self.last_t = 0. @@ -76,6 +76,6 @@ if __name__ == '__main__': if pyglet.version != '1.2dev': - print 'Wrong version of pyglet imported; please check your PYTHONPATH' + print('Wrong version of pyglet imported; please check your PYTHONPATH') else: unittest.main() diff -r dcee1189d959 tests/font/SYSTEM.py --- a/tests/font/SYSTEM.py Tue Oct 23 01:05:32 2012 +0300 +++ b/tests/font/SYSTEM.py Mon Dec 03 10:06:28 2012 +0300 @@ -20,7 +20,7 @@ if sys.platform == 'darwin': font_name = 'Helvetica' elif sys.platform in ('win32', 'cygwin'): - font_name = 'Arial' + font_name = 'Modern No.20' else: font_name = 'Arial' python-patch-ng-1.17.4/tests/06nested/[result]/000077500000000000000000000000001363443050500212275ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/.hgignore000066400000000000000000000001751363443050500230350ustar00rootroot00000000000000syntax: glob *.pyc *.pyo build pyglet.*.log *.orig .DS_Store _htmlapi doc/api doc/_build doc/internal/build.rst website/dist python-patch-ng-1.17.4/tests/06nested/[result]/examples/000077500000000000000000000000001363443050500230455ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/examples/font_comparison.py000066400000000000000000000060101363443050500266140ustar00rootroot00000000000000#!/usr/bin/env python # ---------------------------------------------------------------------------- # pyglet # Copyright (c) 2006-2008 Alex Holkner # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. # * Neither the name of pyglet nor the names of its # contributors may be used to endorse or promote products # derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # ---------------------------------------------------------------------------- '''A simple tool that may be used to compare font faces. Use the left/right cursor keys to change font faces. ''' __docformat__ = 'restructuredtext' __version__ = '$Id: $' import pyglet FONTS = ['Andale Mono', 'Consolas', 'Inconsolata', 'Inconsolata-dz', 'Monaco', 'Menlo'] SAMPLE = '''\ class Spam(object): def __init__(self): # The quick brown fox self.spam = {"jumped": 'over'} @the def lazy(self, *dog): self.dog = [lazy, lazy]''' class Window(pyglet.window.Window): font_num = 0 def on_text_motion(self, motion): if motion == pyglet.window.key.MOTION_RIGHT: self.font_num += 1 if self.font_num == len(FONTS): self.font_num = 0 elif motion == pyglet.window.key.MOTION_LEFT: self.font_num -= 1 if self.font_num < 0: self.font_num = len(FONTS) - 1 face = FONTS[self.font_num] self.head = pyglet.text.Label(face, font_size=24, y=0, anchor_y='bottom') self.text = pyglet.text.Label(SAMPLE, font_name=face, font_size=18, y=self.height, anchor_y='top', width=self.width, multiline=True) def on_draw(self): self.clear() self.head.draw() self.text.draw() window = Window() window.on_text_motion(None) pyglet.app.run() python-patch-ng-1.17.4/tests/06nested/[result]/experimental/000077500000000000000000000000001363443050500237245ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/experimental/console.py000066400000000000000000000076161363443050500257520ustar00rootroot00000000000000#!/usr/bin/env python ''' ''' __docformat__ = 'restructuredtext' __version__ = '$Id$' import code import sys import traceback import pyglet.event import pyglet.text from pyglet.window import key from pyglet.gl import * class Console(object): def __init__(self, width, height, globals=None, locals=None): self.font = pyglet.font.load('bitstream vera sans mono', 12) self.lines = [] self.buffer = '' self.pre_buffer = '' self.prompt = '>>> ' self.prompt2 = '... ' self.globals = globals self.locals = locals self.write_pending = '' self.width, self.height = (width, height) self.max_lines = self.height / (self.font.ascent - self.font.descent) - 1 self.write('pyglet command console\n') self.write('Version %s\n' % __version__) def on_key_press(self, symbol, modifiers): # TODO cursor control / line editing if modifiers & key.key.MOD_CTRL and symbol == key.key.C: self.buffer = '' self.pre_buffer = '' return if symbol == key.key.ENTER: self.write('%s%s\n' % (self.get_prompt(), self.buffer)) self.execute(self.pre_buffer + self.buffer) self.buffer = '' return if symbol == key.key.BACKSPACE: self.buffer = self.buffer[:-1] return return EVENT_UNHANDLED def on_text(self, text): if ' ' <= text <= '~': self.buffer += text if 0xae <= ord(text) <= 0xff: self.buffer += text def write(self, text): if self.write_pending: text = self.write_pending + text self.write_pending = '' if type(text) in (str, unicode): text = text.split('\n') if text[-1] != '': self.write_pending = text[-1] del text[-1] self.lines = [pyglet.text.layout_text(line.strip(), font=self.font) for line in text] + self.lines if len(self.lines) > self.max_lines: del self.lines[-1] def execute(self, input): old_stderr, old_stdout = sys.stderr, sys.stdout sys.stderr = sys.stdout = self try: c = code.compile_command(input, '') if c is None: self.pre_buffer = '%s\n' % input else: self.pre_buffer = '' result = eval(c, self.globals, self.locals) if result is not None: self.write('%r\n' % result) except: traceback.print_exc() self.pre_buffer = '' sys.stderr = old_stderr sys.stdout = old_stdout def get_prompt(self): if self.pre_buffer: return self.prompt2 return self.prompt __last = None def draw(self): pyglet.text.begin() glPushMatrix() glTranslatef(0, self.height, 0) for line in self.lines[::-1]: line.draw() glTranslatef(0, -self.font.glyph_height, 0) line = self.get_prompt() + self.buffer if self.__last is None or line != self.__last[0]: self.__last = (line, pyglet.text.layout_text(line.strip(), font=self.font)) self.__last[1].draw() glPopMatrix() pyglet.text.end() if __name__ == '__main__': from pyglet.window import * from pyglet.window.event import * from pyglet import clock w1 = Window(width=600, height=400) console = Console(w1.width, w1.height) w1.push_handlers(console) c = clock.Clock() glMatrixMode(GL_PROJECTION) glLoadIdentity() glOrtho(0, w1.width, 0, w1.height, -1, 1) glEnable(GL_COLOR_MATERIAL) glMatrixMode(GL_MODELVIEW) glClearColor(1, 1, 1, 1) while not w1.has_exit: c.set_fps(60) w1.dispatch_events() glClear(GL_COLOR_BUFFER_BIT) console.draw() w1.flip() python-patch-ng-1.17.4/tests/06nested/[result]/pyglet/000077500000000000000000000000001363443050500225335ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/pyglet/font/000077500000000000000000000000001363443050500235015ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/pyglet/font/win32.py000066400000000000000000000226441363443050500250250ustar00rootroot00000000000000# ---------------------------------------------------------------------------- # pyglet # Copyright (c) 2006-2008 Alex Holkner # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. # * Neither the name of pyglet nor the names of its # contributors may be used to endorse or promote products # derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # ---------------------------------------------------------------------------- ''' ''' # TODO Windows Vista: need to call SetProcessDPIAware? May affect GDI+ calls # as well as font. from ctypes import * import ctypes import math from sys import byteorder import pyglet from pyglet.font import base from pyglet.font import win32query import pyglet.image from pyglet.libs.win32.constants import * from pyglet.libs.win32.types import * from pyglet.libs.win32 import _gdi32 as gdi32, _user32 as user32 from pyglet.libs.win32 import _kernel32 as kernel32 from pyglet.compat import asbytes _debug_font = pyglet.options['debug_font'] def str_ucs2(text): if byteorder == 'big': text = text.encode('utf_16_be') else: text = text.encode('utf_16_le') # explicit endian avoids BOM return create_string_buffer(text + '\0') _debug_dir = 'debug_font' def _debug_filename(base, extension): import os if not os.path.exists(_debug_dir): os.makedirs(_debug_dir) name = '%s-%%d.%%s' % os.path.join(_debug_dir, base) num = 1 while os.path.exists(name % (num, extension)): num += 1 return name % (num, extension) def _debug_image(image, name): filename = _debug_filename(name, 'png') image.save(filename) _debug('Saved image %r to %s' % (image, filename)) _debug_logfile = None def _debug(msg): global _debug_logfile if not _debug_logfile: _debug_logfile = open(_debug_filename('log', 'txt'), 'wt') _debug_logfile.write(msg + '\n') class Win32GlyphRenderer(base.GlyphRenderer): _bitmap = None _dc = None _bitmap_rect = None def __init__(self, font): super(Win32GlyphRenderer, self).__init__(font) self.font = font # Pessimistically round up width and height to 4 byte alignment width = font.max_glyph_width height = font.ascent - font.descent width = (width | 0x3) + 1 height = (height | 0x3) + 1 self._create_bitmap(width, height) gdi32.SelectObject(self._dc, self.font.hfont) def _create_bitmap(self, width, height): pass def render(self, text): raise NotImplementedError('abstract') class GDIGlyphRenderer(Win32GlyphRenderer): def __del__(self): try: if self._dc: gdi32.DeleteDC(self._dc) if self._bitmap: gdi32.DeleteObject(self._bitmap) except: pass def render(self, text): # Attempt to get ABC widths (only for TrueType) abc = ABC() if gdi32.GetCharABCWidthsW(self._dc, ord(text), ord(text), byref(abc)): width = abc.abcB lsb = abc.abcA advance = abc.abcA + abc.abcB + abc.abcC else: width_buf = c_int() gdi32.GetCharWidth32W(self._dc, ord(text), ord(text), byref(width_buf)) width = width_buf.value lsb = 0 advance = width # Can't get glyph-specific dimensions, use whole line-height. height = self._bitmap_height image = self._get_image(text, width, height, lsb) glyph = self.font.create_glyph(image) glyph.set_bearings(-self.font.descent, lsb, advance) if _debug_font: _debug('%r.render(%s)' % (self, text)) _debug('abc.abcA = %r' % abc.abcA) _debug('abc.abcB = %r' % abc.abcB) _debug('abc.abcC = %r' % abc.abcC) _debug('width = %r' % width) _debug('height = %r' % height) _debug('lsb = %r' % lsb) _debug('advance = %r' % advance) _debug_image(image, 'glyph_%s' % text) _debug_image(self.font.textures[0], 'tex_%s' % text) return glyph def _get_image(self, text, width, height, lsb): # There's no such thing as a greyscale bitmap format in GDI. We can # create an 8-bit palette bitmap with 256 shades of grey, but # unfortunately antialiasing will not work on such a bitmap. So, we # use a 32-bit bitmap and use the red channel as OpenGL's alpha. gdi32.SelectObject(self._dc, self._bitmap) gdi32.SelectObject(self._dc, self.font.hfont) gdi32.SetBkColor(self._dc, 0x0) gdi32.SetTextColor(self._dc, 0x00ffffff) gdi32.SetBkMode(self._dc, OPAQUE) # Draw to DC user32.FillRect(self._dc, byref(self._bitmap_rect), self._black) gdi32.ExtTextOutA(self._dc, -lsb, 0, 0, None, text, len(text), None) gdi32.GdiFlush() # Create glyph object and copy bitmap data to texture image = pyglet.image.ImageData(width, height, 'AXXX', self._bitmap_data, self._bitmap_rect.right * 4) return image def _create_bitmap(self, width, height): self._black = gdi32.GetStockObject(BLACK_BRUSH) self._white = gdi32.GetStockObject(WHITE_BRUSH) if self._dc: gdi32.ReleaseDC(self._dc) if self._bitmap: gdi32.DeleteObject(self._bitmap) pitch = width * 4 data = POINTER(c_byte * (height * pitch))() info = BITMAPINFO() info.bmiHeader.biSize = sizeof(info.bmiHeader) info.bmiHeader.biWidth = width info.bmiHeader.biHeight = height info.bmiHeader.biPlanes = 1 info.bmiHeader.biBitCount = 32 info.bmiHeader.biCompression = BI_RGB self._dc = gdi32.CreateCompatibleDC(None) self._bitmap = gdi32.CreateDIBSection(None, byref(info), DIB_RGB_COLORS, byref(data), None, 0) # Spookiness: the above line causes a "not enough storage" error, # even though that error cannot be generated according to docs, # and everything works fine anyway. Call SetLastError to clear it. kernel32.SetLastError(0) self._bitmap_data = data.contents self._bitmap_rect = RECT() self._bitmap_rect.left = 0 self._bitmap_rect.right = width self._bitmap_rect.top = 0 self._bitmap_rect.bottom = height self._bitmap_height = height if _debug_font: _debug('%r._create_dc(%d, %d)' % (self, width, height)) _debug('_dc = %r' % self._dc) _debug('_bitmap = %r' % self._bitmap) _debug('pitch = %r' % pitch) _debug('info.bmiHeader.biSize = %r' % info.bmiHeader.biSize) class Win32Font(base.Font): glyph_renderer_class = GDIGlyphRenderer def __init__(self, name, size, bold=False, italic=False, dpi=None): super(Win32Font, self).__init__() self.logfont = self.get_logfont(name, size, bold, italic, dpi) self.hfont = gdi32.CreateFontIndirectA(byref(self.logfont)) # Create a dummy DC for coordinate mapping dc = user32.GetDC(0) metrics = TEXTMETRIC() gdi32.SelectObject(dc, self.hfont) gdi32.GetTextMetricsA(dc, byref(metrics)) self.ascent = metrics.tmAscent self.descent = -metrics.tmDescent self.max_glyph_width = metrics.tmMaxCharWidth @staticmethod def get_logfont(name, size, bold, italic, dpi): # Create a dummy DC for coordinate mapping dc = user32.GetDC(0) if dpi is None: dpi = 96 logpixelsy = dpi logfont = LOGFONT() # Conversion of point size to device pixels logfont.lfHeight = int(-size * logpixelsy // 72) if bold: logfont.lfWeight = FW_BOLD else: logfont.lfWeight = FW_NORMAL logfont.lfItalic = italic logfont.lfFaceName = asbytes(name) logfont.lfQuality = ANTIALIASED_QUALITY return logfont @classmethod def have_font(cls, name): return win32query.have_font(name) @classmethod def add_font_data(cls, data): numfonts = c_uint32() gdi32.AddFontMemResourceEx(data, len(data), 0, byref(numfonts)) # ...python-patch-ng-1.17.4/tests/06nested/[result]/tests/000077500000000000000000000000001363443050500223715ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/tests/app/000077500000000000000000000000001363443050500231515ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/tests/app/EVENT_LOOP.py000066400000000000000000000043231363443050500252370ustar00rootroot00000000000000#!/usr/bin/python '''Test that the event loop can do timing. The test will display a series of intervals, iterations and sleep times. It should then display an incrementing number up to 2x the number of iterations, at a rate determined by the interval. ''' import sys import unittest import pyglet __noninteractive = True if sys.platform in ('win32', 'cygwin'): from time import clock as time else: from time import time from time import sleep class EVENT_LOOP(unittest.TestCase): def t_scheduled(self, interval, iterations, sleep_time=0): print('Test interval=%s, iterations=%s, sleep=%s' % (interval, iterations, sleep_time)) warmup_iterations = iterations self.last_t = 0. self.timer_count = 0 def f(dt): sys.stdout.write('%s\r' % self.timer_count) sys.stdout.flush() t = time() self.timer_count += 1 tc = self.timer_count if tc > warmup_iterations: self.assertAlmostEqual(dt, interval, places=2) self.assertAlmostEqual(t - self.last_t, interval, places=2) self.last_t = t if self.timer_count > iterations + warmup_iterations: pyglet.app.exit() if sleep_time: sleep(sleep_time) pyglet.clock.schedule_interval(f, interval) try: pyglet.app.run() finally: pyglet.clock.unschedule(f) print def test_1_5(self): self.t_scheduled(1, 5, 0) def test_1_5_d5(self): self.t_scheduled(1, 5, 0.5) def test_d1_50(self): self.t_scheduled(.1, 50) def test_d1_50_d05(self): self.t_scheduled(.1, 50, 0.05) def test_d05_50(self): self.t_scheduled(.05, 50) def test_d05_50_d03(self): self.t_scheduled(.05, 50, 0.03) def test_d02_50(self): self.t_scheduled(.02, 50) def test_d01_50(self): self.t_scheduled(.01, 50) if __name__ == '__main__': if pyglet.version != '1.2dev': print('Wrong version of pyglet imported; please check your PYTHONPATH') else: unittest.main() python-patch-ng-1.17.4/tests/06nested/[result]/tests/font/000077500000000000000000000000001363443050500233375ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/[result]/tests/font/SYSTEM.py000066400000000000000000000012241363443050500247340ustar00rootroot00000000000000#!/usr/bin/env python '''Test that a font likely to be installed on the computer can be loaded and displayed correctly. One window will open, it should show "Quickly brown fox" at 24pt using: * "Helvetica" on Mac OS X * "Arial" on Windows ''' __docformat__ = 'restructuredtext' __version__ = '$Id: $' import unittest import sys from . import base_text if sys.platform == 'darwin': font_name = 'Helvetica' elif sys.platform in ('win32', 'cygwin'): font_name = 'Modern No.20' else: font_name = 'Arial' class TEST_SYSTEM(base_text.TextTestBase): font_name = font_name font_size = 24 if __name__ == '__main__': unittest.main() python-patch-ng-1.17.4/tests/06nested/examples/000077500000000000000000000000001363443050500212375ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/examples/font_comparison.py000066400000000000000000000057561363443050500250260ustar00rootroot00000000000000#!/usr/bin/env python # ---------------------------------------------------------------------------- # pyglet # Copyright (c) 2006-2008 Alex Holkner # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. # * Neither the name of pyglet nor the names of its # contributors may be used to endorse or promote products # derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # ---------------------------------------------------------------------------- '''A simple tool that may be used to compare font faces. Use the left/right cursor keys to change font faces. ''' __docformat__ = 'restructuredtext' __version__ = '$Id: $' import pyglet FONTS = ['Andale Mono', 'Consolas', 'Inconsolata', 'Inconsolata-dz', 'Monaco', 'Menlo'] SAMPLE = '''class Spam(object): def __init__(self): # The quick brown fox self.spam = {"jumped": 'over'} @the def lazy(self, *dog): self.dog = [lazy, lazy]''' class Window(pyglet.window.Window): font_num = 0 def on_text_motion(self, motion): if motion == pyglet.window.key.MOTION_RIGHT: self.font_num += 1 if self.font_num == len(FONTS): self.font_num = 0 elif motion == pyglet.window.key.MOTION_LEFT: self.font_num -= 1 if self.font_num < 0: self.font_num = len(FONTS) - 1 face = FONTS[self.font_num] self.head = pyglet.text.Label(face, font_size=24, y=0, anchor_y='bottom') self.text = pyglet.text.Label(SAMPLE, font_name=face, font_size=18, y=self.height, anchor_y='top', width=self.width, multiline=True) def on_draw(self): self.clear() self.head.draw() self.text.draw() window = Window() window.on_text_motion(None) pyglet.app.run() python-patch-ng-1.17.4/tests/06nested/experimental/000077500000000000000000000000001363443050500221165ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/experimental/console.py000066400000000000000000000076271363443050500241460ustar00rootroot00000000000000#!/usr/bin/env python ''' ''' __docformat__ = 'restructuredtext' __version__ = '$Id$' import code import sys import traceback import pyglet.event import pyglet.text from pyglet.window import key from pyglet.gl import * class Console(object): def __init__(self, width, height, globals=None, locals=None): self.font = pyglet.text.default_font_factory.get_font('bitstream vera sans mono', 12) self.lines = [] self.buffer = '' self.pre_buffer = '' self.prompt = '>>> ' self.prompt2 = '... ' self.globals = globals self.locals = locals self.write_pending = '' self.width, self.height = (width, height) self.max_lines = self.height / self.font.glyph_height - 1 self.write('pyglet command console\n') self.write('Version %s\n' % __version__) def on_key_press(self, symbol, modifiers): # TODO cursor control / line editing if modifiers & key.key.MOD_CTRL and symbol == key.key.C: self.buffer = '' self.pre_buffer = '' return if symbol == key.key.ENTER: self.write('%s%s\n' % (self.get_prompt(), self.buffer)) self.execute(self.pre_buffer + self.buffer) self.buffer = '' return if symbol == key.key.BACKSPACE: self.buffer = self.buffer[:-1] return return EVENT_UNHANDLED def on_text(self, text): if ' ' <= text <= '~': self.buffer += text if 0xae <= ord(text) <= 0xff: self.buffer += text def write(self, text): if self.write_pending: text = self.write_pending + text self.write_pending = '' if type(text) in (str, unicode): text = text.split('\n') if text[-1] != '': self.write_pending = text[-1] del text[-1] self.lines = [pyglet.text.layout_text(line.strip(), font=self.font) for line in text] + self.lines if len(self.lines) > self.max_lines: del self.lines[-1] def execute(self, input): old_stderr, old_stdout = sys.stderr, sys.stdout sys.stderr = sys.stdout = self try: c = code.compile_command(input, '') if c is None: self.pre_buffer = '%s\n' % input else: self.pre_buffer = '' result = eval(c, self.globals, self.locals) if result is not None: self.write('%r\n' % result) except: traceback.print_exc() self.pre_buffer = '' sys.stderr = old_stderr sys.stdout = old_stdout def get_prompt(self): if self.pre_buffer: return self.prompt2 return self.prompt __last = None def draw(self): pyglet.text.begin() glPushMatrix() glTranslatef(0, self.height, 0) for line in self.lines[::-1]: line.draw() glTranslatef(0, -self.font.glyph_height, 0) line = self.get_prompt() + self.buffer if self.__last is None or line != self.__last[0]: self.__last = (line, pyglet.text.layout_text(line.strip(), font=self.font)) self.__last[1].draw() glPopMatrix() pyglet.text.end() if __name__ == '__main__': from pyglet.window import * from pyglet.window.event import * from pyglet import clock w1 = Window(width=600, height=400) console = Console(w1.width, w1.height) w1.push_handlers(console) c = clock.Clock() glMatrixMode(GL_PROJECTION) glLoadIdentity() glOrtho(0, w1.width, 0, w1.height, -1, 1) glEnable(GL_COLOR_MATERIAL) glMatrixMode(GL_MODELVIEW) glClearColor(1, 1, 1, 1) while not w1.has_exit: c.set_fps(60) w1.dispatch_events() glClear(GL_COLOR_BUFFER_BIT) console.draw() w1.flip() python-patch-ng-1.17.4/tests/06nested/pyglet/000077500000000000000000000000001363443050500207255ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/pyglet/font/000077500000000000000000000000001363443050500216735ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/pyglet/font/win32.py000066400000000000000000000227421363443050500232160ustar00rootroot00000000000000# ---------------------------------------------------------------------------- # pyglet # Copyright (c) 2006-2008 Alex Holkner # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. # * Neither the name of pyglet nor the names of its # contributors may be used to endorse or promote products # derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE # COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # ---------------------------------------------------------------------------- ''' ''' # TODO Windows Vista: need to call SetProcessDPIAware? May affect GDI+ calls # as well as font. from ctypes import * import ctypes import math from sys import byteorder import pyglet from pyglet.font import base import pyglet.image from pyglet.libs.win32.constants import * from pyglet.libs.win32.types import * from pyglet.libs.win32 import _gdi32 as gdi32, _user32 as user32 from pyglet.libs.win32 import _kernel32 as kernel32 from pyglet.compat import asbytes _debug_font = pyglet.options['debug_font'] def str_ucs2(text): if byteorder == 'big': text = text.encode('utf_16_be') else: text = text.encode('utf_16_le') # explicit endian avoids BOM return create_string_buffer(text + '\0') _debug_dir = 'debug_font' def _debug_filename(base, extension): import os if not os.path.exists(_debug_dir): os.makedirs(_debug_dir) name = '%s-%%d.%%s' % os.path.join(_debug_dir, base) num = 1 while os.path.exists(name % (num, extension)): num += 1 return name % (num, extension) def _debug_image(image, name): filename = _debug_filename(name, 'png') image.save(filename) _debug('Saved image %r to %s' % (image, filename)) _debug_logfile = None def _debug(msg): global _debug_logfile if not _debug_logfile: _debug_logfile = open(_debug_filename('log', 'txt'), 'wt') _debug_logfile.write(msg + '\n') class Win32GlyphRenderer(base.GlyphRenderer): _bitmap = None _dc = None _bitmap_rect = None def __init__(self, font): super(Win32GlyphRenderer, self).__init__(font) self.font = font # Pessimistically round up width and height to 4 byte alignment width = font.max_glyph_width height = font.ascent - font.descent width = (width | 0x3) + 1 height = (height | 0x3) + 1 self._create_bitmap(width, height) gdi32.SelectObject(self._dc, self.font.hfont) def _create_bitmap(self, width, height): pass def render(self, text): raise NotImplementedError('abstract') class GDIGlyphRenderer(Win32GlyphRenderer): def __del__(self): try: if self._dc: gdi32.DeleteDC(self._dc) if self._bitmap: gdi32.DeleteObject(self._bitmap) except: pass def render(self, text): # Attempt to get ABC widths (only for TrueType) abc = ABC() if gdi32.GetCharABCWidthsW(self._dc, ord(text), ord(text), byref(abc)): width = abc.abcB lsb = abc.abcA advance = abc.abcA + abc.abcB + abc.abcC else: width_buf = c_int() gdi32.GetCharWidth32W(self._dc, ord(text), ord(text), byref(width_buf)) width = width_buf.value lsb = 0 advance = width # Can't get glyph-specific dimensions, use whole line-height. height = self._bitmap_height image = self._get_image(text, width, height, lsb) glyph = self.font.create_glyph(image) glyph.set_bearings(-self.font.descent, lsb, advance) if _debug_font: _debug('%r.render(%s)' % (self, text)) _debug('abc.abcA = %r' % abc.abcA) _debug('abc.abcB = %r' % abc.abcB) _debug('abc.abcC = %r' % abc.abcC) _debug('width = %r' % width) _debug('height = %r' % height) _debug('lsb = %r' % lsb) _debug('advance = %r' % advance) _debug_image(image, 'glyph_%s' % text) _debug_image(self.font.textures[0], 'tex_%s' % text) return glyph def _get_image(self, text, width, height, lsb): # There's no such thing as a greyscale bitmap format in GDI. We can # create an 8-bit palette bitmap with 256 shades of grey, but # unfortunately antialiasing will not work on such a bitmap. So, we # use a 32-bit bitmap and use the red channel as OpenGL's alpha. gdi32.SelectObject(self._dc, self._bitmap) gdi32.SelectObject(self._dc, self.font.hfont) gdi32.SetBkColor(self._dc, 0x0) gdi32.SetTextColor(self._dc, 0x00ffffff) gdi32.SetBkMode(self._dc, OPAQUE) # Draw to DC user32.FillRect(self._dc, byref(self._bitmap_rect), self._black) gdi32.ExtTextOutA(self._dc, -lsb, 0, 0, None, text, len(text), None) gdi32.GdiFlush() # Create glyph object and copy bitmap data to texture image = pyglet.image.ImageData(width, height, 'AXXX', self._bitmap_data, self._bitmap_rect.right * 4) return image def _create_bitmap(self, width, height): self._black = gdi32.GetStockObject(BLACK_BRUSH) self._white = gdi32.GetStockObject(WHITE_BRUSH) if self._dc: gdi32.ReleaseDC(self._dc) if self._bitmap: gdi32.DeleteObject(self._bitmap) pitch = width * 4 data = POINTER(c_byte * (height * pitch))() info = BITMAPINFO() info.bmiHeader.biSize = sizeof(info.bmiHeader) info.bmiHeader.biWidth = width info.bmiHeader.biHeight = height info.bmiHeader.biPlanes = 1 info.bmiHeader.biBitCount = 32 info.bmiHeader.biCompression = BI_RGB self._dc = gdi32.CreateCompatibleDC(None) self._bitmap = gdi32.CreateDIBSection(None, byref(info), DIB_RGB_COLORS, byref(data), None, 0) # Spookiness: the above line causes a "not enough storage" error, # even though that error cannot be generated according to docs, # and everything works fine anyway. Call SetLastError to clear it. kernel32.SetLastError(0) self._bitmap_data = data.contents self._bitmap_rect = RECT() self._bitmap_rect.left = 0 self._bitmap_rect.right = width self._bitmap_rect.top = 0 self._bitmap_rect.bottom = height self._bitmap_height = height if _debug_font: _debug('%r._create_dc(%d, %d)' % (self, width, height)) _debug('_dc = %r' % self._dc) _debug('_bitmap = %r' % self._bitmap) _debug('pitch = %r' % pitch) _debug('info.bmiHeader.biSize = %r' % info.bmiHeader.biSize) class Win32Font(base.Font): glyph_renderer_class = GDIGlyphRenderer def __init__(self, name, size, bold=False, italic=False, dpi=None): super(Win32Font, self).__init__() self.logfont = self.get_logfont(name, size, bold, italic, dpi) self.hfont = gdi32.CreateFontIndirectA(byref(self.logfont)) # Create a dummy DC for coordinate mapping dc = user32.GetDC(0) metrics = TEXTMETRIC() gdi32.SelectObject(dc, self.hfont) gdi32.GetTextMetricsA(dc, byref(metrics)) self.ascent = metrics.tmAscent self.descent = -metrics.tmDescent self.max_glyph_width = metrics.tmMaxCharWidth @staticmethod def get_logfont(name, size, bold, italic, dpi): # Create a dummy DC for coordinate mapping dc = user32.GetDC(0) if dpi is None: dpi = 96 logpixelsy = dpi logfont = LOGFONT() # Conversion of point size to device pixels logfont.lfHeight = int(-size * logpixelsy // 72) if bold: logfont.lfWeight = FW_BOLD else: logfont.lfWeight = FW_NORMAL logfont.lfItalic = italic logfont.lfFaceName = asbytes(name) logfont.lfQuality = ANTIALIASED_QUALITY return logfont @classmethod def have_font(cls, name): # CreateFontIndirect always returns a font... have to work out # something with EnumFontFamily... TODO return True @classmethod def add_font_data(cls, data): numfonts = c_uint32() gdi32.AddFontMemResourceEx(data, len(data), 0, byref(numfonts)) # ...python-patch-ng-1.17.4/tests/06nested/tests/000077500000000000000000000000001363443050500205635ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/tests/app/000077500000000000000000000000001363443050500213435ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/tests/app/EVENT_LOOP.py000066400000000000000000000043211363443050500234270ustar00rootroot00000000000000#!/usr/bin/python '''Test that the event loop can do timing. The test will display a series of intervals, iterations and sleep times. It should then display an incrementing number up to 2x the number of iterations, at a rate determined by the interval. ''' import sys import unittest import pyglet __noninteractive = True if sys.platform in ('win32', 'cygwin'): from time import clock as time else: from time import time from time import sleep class EVENT_LOOP(unittest.TestCase): def t_scheduled(self, interval, iterations, sleep_time=0): print 'Test interval=%s, iterations=%s, sleep=%s' % (interval, iterations, sleep_time) warmup_iterations = iterations self.last_t = 0. self.timer_count = 0 def f(dt): sys.stdout.write('%s\r' % self.timer_count) sys.stdout.flush() t = time() self.timer_count += 1 tc = self.timer_count if tc > warmup_iterations: self.assertAlmostEqual(dt, interval, places=2) self.assertAlmostEqual(t - self.last_t, interval, places=2) self.last_t = t if self.timer_count > iterations + warmup_iterations: pyglet.app.exit() if sleep_time: sleep(sleep_time) pyglet.clock.schedule_interval(f, interval) try: pyglet.app.run() finally: pyglet.clock.unschedule(f) print def test_1_5(self): self.t_scheduled(1, 5, 0) def test_1_5_d5(self): self.t_scheduled(1, 5, 0.5) def test_d1_50(self): self.t_scheduled(.1, 50) def test_d1_50_d05(self): self.t_scheduled(.1, 50, 0.05) def test_d05_50(self): self.t_scheduled(.05, 50) def test_d05_50_d03(self): self.t_scheduled(.05, 50, 0.03) def test_d02_50(self): self.t_scheduled(.02, 50) def test_d01_50(self): self.t_scheduled(.01, 50) if __name__ == '__main__': if pyglet.version != '1.2dev': print 'Wrong version of pyglet imported; please check your PYTHONPATH' else: unittest.main() python-patch-ng-1.17.4/tests/06nested/tests/font/000077500000000000000000000000001363443050500215315ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/06nested/tests/font/SYSTEM.py000066400000000000000000000012151363443050500231260ustar00rootroot00000000000000#!/usr/bin/env python '''Test that a font likely to be installed on the computer can be loaded and displayed correctly. One window will open, it should show "Quickly brown fox" at 24pt using: * "Helvetica" on Mac OS X * "Arial" on Windows ''' __docformat__ = 'restructuredtext' __version__ = '$Id: $' import unittest import sys from . import base_text if sys.platform == 'darwin': font_name = 'Helvetica' elif sys.platform in ('win32', 'cygwin'): font_name = 'Arial' else: font_name = 'Arial' class TEST_SYSTEM(base_text.TextTestBase): font_name = font_name font_size = 24 if __name__ == '__main__': unittest.main() python-patch-ng-1.17.4/tests/07google_code_wiki.from000066400000000000000000000120671363443050500223240ustar00rootroot00000000000000#summary Plugin development #sidebar TOC !!WARNING!! The table below displays the navigation bar !!WARNING!! Please don't touch it unless you know what you're doing.
http://wiki.spyderlib.googlecode.com/hg/Buttons/logo-mini.png
[http://code.google.com/p/spyderlib http://wiki.spyderlib.googlecode.com/hg/Buttons/home.png] [http://code.google.com/p/spyderlib/downloads/list http://wiki.spyderlib.googlecode.com/hg/Buttons/download.png] [http://code.google.com/p/spyderlib/wiki/Features http://wiki.spyderlib.googlecode.com/hg/Buttons/features.png] [http://code.google.com/p/spyderlib/wiki/Screenshots http://wiki.spyderlib.googlecode.com/hg/Buttons/screenshots.png] [http://packages.python.org/spyder/ http://wiki.spyderlib.googlecode.com/hg/Buttons/docs.png] [http://code.google.com/p/spyderlib/wiki/Roadmap http://wiki.spyderlib.googlecode.com/hg/Buttons/roadmap.png] [http://code.google.com/p/spyderlib/wiki/Support http://wiki.spyderlib.googlecode.com/hg/Buttons/support.png] [http://code.google.com/p/spyderlib/wiki/Development http://wiki.spyderlib.googlecode.com/hg/Buttons/development_sel.png] [http://spyder-ide.blogspot.com http://wiki.spyderlib.googlecode.com/hg/Buttons/blog.png]
= Spyder plugin development = ---- == Introduction == Spyder plugins are just importable Python files that use internal APIs to do different stuff in IDE. Spyder goal is to be reusable set of components and widgets, so a lot of stuff inside is made with plugins. For example, code editor and python console are plugins. Object inspector, history browser and so on. You can see them [https://code.google.com/p/spyderlib/source/browse/#hg%2Fspyderlib%2Fplugins here]. There are two type of plugins in Spyder: * `core plugins` - these are standard Spyder components located in `spyderlib.plugins` module. They are explicitly imported like usual Python modules. * `external plugins` - are discovered and imported dynamically, so they should follow naming convention so that Spyder can find them. External plugins are also initialized later all at once when some of the `core` set are already loaded `[reference need]`. Both plugin types should include class that inherits from the same base plugin class. [ ] check if plugins can be enabled/disabled [ ] list of all lookup dirs [ ] how to debug plugin discovery [ ] API reference, version information [ ] time when core plugins are initialized [ ] time when external plugins are initialized == Architecture == Spyder main window is de-facto storage for all Spyder state. == Plugin discovery == `[more research is needed - ask techtonik@gmail.com if you feel capable]` While many software use directories to distribute and find plugins, Spyder uses Python modules. It's own plugin are located under `spyderlib` namespace with all Spyder application. It can be used as a library. External plugins are expected to be found in a special importable module named. * _spyderplugins_: this is what this page is about The module _spyderplugins_ includes third-party plugins of several kinds. TODO: check if prefix for plugin kind really affects loading or if it just a convention In Spyder v1.1, the only kind of plugin supported were the input/output plugins (modules starting with `io_`) which provide I/O functions for the variable explorer (_Workspace_ and _Globals explorer_ in v1.1, _Variable explorer_ in v2.0). Spyder natively supports .mat, .npy, .txt, .csv, .jpg, .png and .tiff file formats. These plugins allow users to add their own types, like HDF5 files for example. In Spyder v2.0, any kind of plugin may be created in the module _spyderplugins_. These third-party plugins may communicate with other Spyder components through the plugin interface (see [http://code.google.com/p/spyderlib/source/browse/spyderlib/plugins/__init__.py spyderlib/plugins/__init__.py]). == I/O Spyder plugins == How to create your own I/O Spyder plugins: * Create a Python module named `io_foobar.py` where `foobar` is the name of your plugin * Write your loading function and/or your saving function: * load: * input is a string: filename * output is a tuple with two elements: dictionary containing at least one element (key is the variable name) and error message (or `None`) * save: * input is a tuple with two elements: data (dictionary), filename * output is a string or `None`: error message or `None` if no error occured * Define the global variables `FORMAT_NAME`, `FORMAT_EXT`, `FORMAT_LOAD` and `FORMAT_SAVE`. See the example of DICOM images support: http://code.google.com/p/spyderlib/source/browse/spyderplugins/io_dicom.py * More examples of load/save functions may be found here: http://code.google.com/p/spyderlib/source/browse/spyderlib/utils/iofuncs.py == Other Spyder plugins == See the example of the `pylint` third-party plugin in Spyder v2.0. python-patch-ng-1.17.4/tests/07google_code_wiki.patch000066400000000000000000000077211363443050500224610ustar00rootroot00000000000000--- a/07google_code_wiki.from +++ b/07google_code_wiki.to @@ -28,7 +28,7 @@ == Introduction == -Spyder plugins are just importable Python files that use internal APIs to do different stuff in IDE. Spyder goal is to be reusable set of components and widgets, so a lot of stuff inside is made with plugins. For example, code editor and python console are plugins. Object inspector, history browser and so on. You can see them [https://code.google.com/p/spyderlib/source/browse/#hg%2Fspyderlib%2Fplugins here]. +Spyder plugins are importable Python modules that may use internal API to do different stuff in IDE. Spyder goal is to be reusable set of components and widgets, so a lot of things is made with plugins. For example, code editor and python console are plugins. Object inspector, history browser and so on. You can see them [https://code.google.com/p/spyderlib/source/browse/#hg%2Fspyderlib%2Fplugins here]. There are two type of plugins in Spyder: * `core plugins` - these are standard Spyder components located in `spyderlib.plugins` module. They are explicitly imported like usual Python modules. @@ -55,15 +55,15 @@ `[more research is needed - ask techtonik@gmail.com if you feel capable]` -While many software use directories to distribute and find plugins, Spyder uses Python modules. It's own plugin are located under `spyderlib` namespace with all Spyder application. It can be used as a library. External plugins are expected to be found in a special importable module named. +Some software use directories for plugin installation and discovery. Spyder uses Python modules. Internal components are contained in `spyderlib` namespace and are imported explicitly. External and 3rd party plugins are automatically imported from certain predefined locations. One such location is `spyderplugins` module. * _spyderplugins_: this is what this page is about +To make you module appear in `spyderplugins` namespace, you need to make Spyder discover and import it first. In Spyder source code tree you can just drop your module into `spyderplugins` directory. This is more like hack than convenient plugin discovery interface, so proposal to fix this are welcome. One of the ideas is to inspect Python files without importing them with `astdump` modules and check if their interface is compatible. This will also allow Spyder to enable/disable plugins from config menu. + The module _spyderplugins_ includes third-party plugins of several kinds. TODO: check if prefix for plugin kind really affects loading or if it just a convention -In Spyder v1.1, the only kind of plugin supported were the input/output plugins (modules starting with `io_`) which provide I/O functions for the variable explorer (_Workspace_ and _Globals explorer_ in v1.1, _Variable explorer_ in v2.0). Spyder natively supports .mat, .npy, .txt, .csv, .jpg, .png and .tiff file formats. These plugins allow users to add their own types, like HDF5 files for example. - In Spyder v2.0, any kind of plugin may be created in the module _spyderplugins_. These third-party plugins may communicate with other Spyder components through the plugin interface (see [http://code.google.com/p/spyderlib/source/browse/spyderlib/plugins/__init__.py spyderlib/plugins/__init__.py]). == I/O Spyder plugins == @@ -82,6 +82,10 @@ * More examples of load/save functions may be found here: http://code.google.com/p/spyderlib/source/browse/spyderlib/utils/iofuncs.py +== History === + +Spyder v1.1 supported only input/output plugins (modules starting with `io_`) which provided I/O functions for the variable explorer (_Workspace_ and _Globals explorer_ in v1.1, _Variable explorer_ in v2.0). Spyder natively supports .mat, .npy, .txt, .csv, .jpg, .png and .tiff file formats out of the box. These input plugins allowed users to add their own types, like HDF5 files for example. + == Other Spyder plugins == See the example of the `pylint` third-party plugin in Spyder v2.0. python-patch-ng-1.17.4/tests/07google_code_wiki.to000066400000000000000000000131321363443050500217750ustar00rootroot00000000000000#summary Plugin development #sidebar TOC !!WARNING!! The table below displays the navigation bar !!WARNING!! Please don't touch it unless you know what you're doing.
http://wiki.spyderlib.googlecode.com/hg/Buttons/logo-mini.png
[http://code.google.com/p/spyderlib http://wiki.spyderlib.googlecode.com/hg/Buttons/home.png] [http://code.google.com/p/spyderlib/downloads/list http://wiki.spyderlib.googlecode.com/hg/Buttons/download.png] [http://code.google.com/p/spyderlib/wiki/Features http://wiki.spyderlib.googlecode.com/hg/Buttons/features.png] [http://code.google.com/p/spyderlib/wiki/Screenshots http://wiki.spyderlib.googlecode.com/hg/Buttons/screenshots.png] [http://packages.python.org/spyder/ http://wiki.spyderlib.googlecode.com/hg/Buttons/docs.png] [http://code.google.com/p/spyderlib/wiki/Roadmap http://wiki.spyderlib.googlecode.com/hg/Buttons/roadmap.png] [http://code.google.com/p/spyderlib/wiki/Support http://wiki.spyderlib.googlecode.com/hg/Buttons/support.png] [http://code.google.com/p/spyderlib/wiki/Development http://wiki.spyderlib.googlecode.com/hg/Buttons/development_sel.png] [http://spyder-ide.blogspot.com http://wiki.spyderlib.googlecode.com/hg/Buttons/blog.png]
= Spyder plugin development = ---- == Introduction == Spyder plugins are importable Python modules that may use internal API to do different stuff in IDE. Spyder goal is to be reusable set of components and widgets, so a lot of things is made with plugins. For example, code editor and python console are plugins. Object inspector, history browser and so on. You can see them [https://code.google.com/p/spyderlib/source/browse/#hg%2Fspyderlib%2Fplugins here]. There are two type of plugins in Spyder: * `core plugins` - these are standard Spyder components located in `spyderlib.plugins` module. They are explicitly imported like usual Python modules. * `external plugins` - are discovered and imported dynamically, so they should follow naming convention so that Spyder can find them. External plugins are also initialized later all at once when some of the `core` set are already loaded `[reference need]`. Both plugin types should include class that inherits from the same base plugin class. [ ] check if plugins can be enabled/disabled [ ] list of all lookup dirs [ ] how to debug plugin discovery [ ] API reference, version information [ ] time when core plugins are initialized [ ] time when external plugins are initialized == Architecture == Spyder main window is de-facto storage for all Spyder state. == Plugin discovery == `[more research is needed - ask techtonik@gmail.com if you feel capable]` Some software use directories for plugin installation and discovery. Spyder uses Python modules. Internal components are contained in `spyderlib` namespace and are imported explicitly. External and 3rd party plugins are automatically imported from certain predefined locations. One such location is `spyderplugins` module. * _spyderplugins_: this is what this page is about To make you module appear in `spyderplugins` namespace, you need to make Spyder discover and import it first. In Spyder source code tree you can just drop your module into `spyderplugins` directory. This is more like hack than convenient plugin discovery interface, so proposal to fix this are welcome. One of the ideas is to inspect Python files without importing them with `astdump` modules and check if their interface is compatible. This will also allow Spyder to enable/disable plugins from config menu. The module _spyderplugins_ includes third-party plugins of several kinds. TODO: check if prefix for plugin kind really affects loading or if it just a convention In Spyder v2.0, any kind of plugin may be created in the module _spyderplugins_. These third-party plugins may communicate with other Spyder components through the plugin interface (see [http://code.google.com/p/spyderlib/source/browse/spyderlib/plugins/__init__.py spyderlib/plugins/__init__.py]). == I/O Spyder plugins == How to create your own I/O Spyder plugins: * Create a Python module named `io_foobar.py` where `foobar` is the name of your plugin * Write your loading function and/or your saving function: * load: * input is a string: filename * output is a tuple with two elements: dictionary containing at least one element (key is the variable name) and error message (or `None`) * save: * input is a tuple with two elements: data (dictionary), filename * output is a string or `None`: error message or `None` if no error occured * Define the global variables `FORMAT_NAME`, `FORMAT_EXT`, `FORMAT_LOAD` and `FORMAT_SAVE`. See the example of DICOM images support: http://code.google.com/p/spyderlib/source/browse/spyderplugins/io_dicom.py * More examples of load/save functions may be found here: http://code.google.com/p/spyderlib/source/browse/spyderlib/utils/iofuncs.py == History === Spyder v1.1 supported only input/output plugins (modules starting with `io_`) which provided I/O functions for the variable explorer (_Workspace_ and _Globals explorer_ in v1.1, _Variable explorer_ in v2.0). Spyder natively supports .mat, .npy, .txt, .csv, .jpg, .png and .tiff file formats out of the box. These input plugins allowed users to add their own types, like HDF5 files for example. == Other Spyder plugins == See the example of the `pylint` third-party plugin in Spyder v2.0. python-patch-ng-1.17.4/tests/08create/000077500000000000000000000000001363443050500174045ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/08create/08create.patch000066400000000000000000000002421363443050500220360ustar00rootroot00000000000000diff -urN from/created to/created --- created 1970-01-01 01:00:00.000000000 +0100 +++ created 2016-06-07 00:43:08.701304500 +0100 @@ -0,0 +1 @@ +Created by patch python-patch-ng-1.17.4/tests/08create/[result]/000077500000000000000000000000001363443050500212125ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/08create/[result]/created000066400000000000000000000000211363443050500225350ustar00rootroot00000000000000Created by patch python-patch-ng-1.17.4/tests/09delete/000077500000000000000000000000001363443050500174045ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/09delete/09delete.patch000066400000000000000000000002421363443050500220360ustar00rootroot00000000000000diff -urN from/deleted to/deleted --- deleted 2016-06-07 00:44:19.093323300 +0100 +++ deleted 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Deleted by patch python-patch-ng-1.17.4/tests/09delete/[result]/000077500000000000000000000000001363443050500212125ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/09delete/[result]/.gitkeep000066400000000000000000000000011363443050500226320ustar00rootroot00000000000000 python-patch-ng-1.17.4/tests/09delete/deleted000066400000000000000000000000211363443050500207260ustar00rootroot00000000000000Deleted by patch python-patch-ng-1.17.4/tests/10fuzzy/000077500000000000000000000000001363443050500173215ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/10fuzzy/10fuzzy.patch000066400000000000000000000001671363443050500216760ustar00rootroot00000000000000diff --git a/Jamroot b/Jamroot index a6981dd..0c08f09 100644 --- a/Jamroot +++ b/Jamroot @@ -1,3 +1,4 @@ X YYYY +V Wpython-patch-ng-1.17.4/tests/10fuzzy/Jamroot000066400000000000000000000000051363443050500206520ustar00rootroot00000000000000X Y Zpython-patch-ng-1.17.4/tests/10fuzzy/[result]/000077500000000000000000000000001363443050500211275ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/10fuzzy/[result]/Jamroot000066400000000000000000000000071363443050500224620ustar00rootroot00000000000000X Y V Zpython-patch-ng-1.17.4/tests/10fuzzyafter/000077500000000000000000000000001363443050500203435ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/10fuzzyafter/10fuzzyafter.patch000066400000000000000000000001641363443050500237370ustar00rootroot00000000000000diff --git a/Jamroot b/Jamroot index a6981dd..0c08f09 100644 --- a/Jamroot +++ b/Jamroot @@ -1,3 +1,4 @@ X Y +V Wpython-patch-ng-1.17.4/tests/10fuzzyafter/Jamroot000066400000000000000000000000051363443050500216740ustar00rootroot00000000000000X Y Zpython-patch-ng-1.17.4/tests/10fuzzyafter/[result]/000077500000000000000000000000001363443050500221515ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/10fuzzyafter/[result]/Jamroot000066400000000000000000000000071363443050500235040ustar00rootroot00000000000000X Y V Zpython-patch-ng-1.17.4/tests/10fuzzybefore/000077500000000000000000000000001363443050500205045ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/10fuzzybefore/10fuzzybefore.patch000066400000000000000000000001671363443050500242440ustar00rootroot00000000000000diff --git a/Jamroot b/Jamroot index a6981dd..0c08f09 100644 --- a/Jamroot +++ b/Jamroot @@ -1,3 +1,4 @@ T YYYY +V Zpython-patch-ng-1.17.4/tests/10fuzzybefore/Jamroot000066400000000000000000000000051363443050500220350ustar00rootroot00000000000000X Y Zpython-patch-ng-1.17.4/tests/10fuzzybefore/[result]/000077500000000000000000000000001363443050500223125ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/10fuzzybefore/[result]/Jamroot000066400000000000000000000000071363443050500236450ustar00rootroot00000000000000X Y V Zpython-patch-ng-1.17.4/tests/11permission/000077500000000000000000000000001363443050500203235ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/11permission/11permission.patch000066400000000000000000000001441363443050500236750ustar00rootroot00000000000000--- some_file +++ some_file @@ -2,6 +2,7 @@ line 2 line 3 line 4 +line 5 line 6 line 7 line 8 python-patch-ng-1.17.4/tests/11permission/[result]/000077500000000000000000000000001363443050500221315ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/11permission/[result]/some_file000066400000000000000000000001071363443050500240140ustar00rootroot00000000000000line 1 line 2 line 3 line 4 line 5 line 6 line 7 line 8 line 9 line 10 python-patch-ng-1.17.4/tests/11permission/some_file000066400000000000000000000001001363443050500221770ustar00rootroot00000000000000line 1 line 2 line 3 line 4 line 6 line 7 line 8 line 9 line 10 python-patch-ng-1.17.4/tests/Descript.ion000066400000000000000000000004701363443050500202560ustar00rootroot0000000000000001uni_multi.patch unified diff multiple files 02uni_newline.patch newline at the end of file 03trail_fname.patch trailing spaces in patch filenames 04can_patch.patch can be applied multiple times to the same file data various patch data samples 06nested.patch nested dirs 05hg_change.patch mercurial diff python-patch-ng-1.17.4/tests/data/000077500000000000000000000000001363443050500167025ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/data/autofix/000077500000000000000000000000001363443050500203615ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/data/autofix/absolute-path.diff000066400000000000000000000026501363443050500237660ustar00rootroot00000000000000Index: c:/winnt/tests/run_tests.py =================================================================== --- c:/winnt/tests/run_tests.py (revision 132) +++ c:/winnt/tests/run_tests.py (working copy) @@ -240,6 +240,12 @@ self.assertNotEqual(pto.parse(fp), True) fp.close() + def test_fail_absolute_path(self): + fp = open(join(tests_dir, "data/failing/absolute-path.diff")) + res = patch.PatchSet().parse(fp) + self.assertFalse(res) + fp.close() + class TestPatchApply(unittest.TestCase): def setUp(self): self.save_cwd = os.getcwdu() Index: c:/winnt/patch_ng.py =================================================================== --- c:/winnt/patch_ng.py (revision 132) +++ c:/winnt/patch_ng.py (working copy) @@ -22,7 +22,7 @@ from StringIO import StringIO import urllib2 -from os.path import exists, isfile, abspath +from os.path import exists, isabs, isfile, abspath from os import unlink @@ -439,7 +439,21 @@ return (errors == 0) + def process_filenames(): + """ sanitize filenames + return True on success + """ + errors = 0 + for i,p in enumerate(self.items): + # + + # absolute paths are not allowed + if isabs(p.source) or isabs(p.target): + warning("error: absolute paths are not allowed for patch no.%d" % i) + + return (errors == 0) + def apply(self): """ apply parsed patch return True on success python-patch-ng-1.17.4/tests/data/autofix/parent-path.diff000066400000000000000000000004631363443050500234410ustar00rootroot00000000000000Index: patch_ng.py =================================================================== --- ../patch_ng.py (revision 151) +++ ../patch_ng.py (working copy) @@ -13,7 +13,7 @@ """ __author__ = "techtonik.rainforce.org" -__version__ = "1.11.10-dev" +__version__ = "1.11.11-dev" import copy import logging python-patch-ng-1.17.4/tests/data/autofix/stripped-trailing-whitespace.diff000066400000000000000000000031071363443050500270070ustar00rootroot00000000000000Index: Python/peephole.c =================================================================== --- Python/peephole.c (revision 72970) +++ Python/peephole.c (working copy) @@ -180,11 +180,12 @@ } static int -fold_unaryops_on_constants(unsigned char *codestr, PyObject *consts) +fold_unaryops_on_constants(unsigned char *codestr, PyObject *consts, + PyObject *names) { PyObject *newconst=NULL, *v; Py_ssize_t len_consts; - int opcode; + int opcode, i = 1, j; /* Pre-conditions */ assert(PyList_CheckExact(consts)); @@ -205,6 +206,11 @@ case UNARY_INVERT: newconst = PyNumber_Invert(v); break; + case LOAD_ATTR: + i = 3; + newconst = PyObject_GetAttr(v, + PyTuple_GET_ITEM(names, GETARG(codestr, 3))); + break; default: /* Called with an unknown opcode */ PyErr_Format(PyExc_SystemError, @@ -226,9 +232,11 @@ Py_DECREF(newconst); /* Write NOP LOAD_CONST newconst */ - codestr[0] = NOP; - codestr[1] = LOAD_CONST; - SETARG(codestr, 1, len_consts); + for (j = 0; j < i; j++) { + codestr[j] = NOP; + } + codestr[i] = LOAD_CONST; + SETARG(codestr, i, len_consts); return 1; } @@ -484,10 +492,13 @@ case UNARY_NEGATIVE: case UNARY_CONVERT: case UNARY_INVERT: + case LOAD_ATTR: if (lastlc >= 1 && ISBASICBLOCK(blocks, i-3, 4) && - fold_unaryops_on_constants(&codestr[i-3], consts)) { - i -= 2; + fold_unaryops_on_constants(&codestr[i-3], consts, names)) { + if (opcode != LOAD_ATTR) { + i -= 2; + } assert(codestr[i] == LOAD_CONST); cumlc = 1; } python-patch-ng-1.17.4/tests/data/exotic/000077500000000000000000000000001363443050500201755ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/data/exotic/diff.py-python25.diff000066400000000000000000000012561363443050500240600ustar00rootroot00000000000000--- diff.py Sun Dec 27 16:08:28 2009 +++ trunk/diff.py Sun Dec 27 15:46:58 2009 @@ -7,7 +7,7 @@ """ -import sys, os, datetime, difflib, optparse +import sys, os, time, difflib, optparse def main(): @@ -29,8 +29,8 @@ n = options.lines fromfile, tofile = args - fromdate = datetime.datetime.fromtimestamp( os.stat(fromfile).st_mtime ).strftime(" ") - todate = datetime.datetime.fromtimestamp( os.stat(fromfile).st_mtime ).strftime(" ") + fromdate = time.ctime(os.stat(fromfile).st_mtime) + todate = time.ctime(os.stat(tofile).st_mtime) fromlines = open(fromfile, 'U').readlines() tolines = open(tofile, 'U').readlines() python-patch-ng-1.17.4/tests/data/exotic/dpatch.diff000066400000000000000000000014741363443050500223000ustar00rootroot00000000000000#! /bin/sh /usr/share/dpatch/dpatch-run ## 30_default_charset_utf8.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Use UTF-8 as default charset @DPATCH@ diff -uraN trac-0.11.5.orig/trac/mimeview/api.py trac-0.11.5/trac/mimeview/api.py --- trac-0.11.5.orig/trac/mimeview/api.py 2009-06-30 21:18:58.000000000 +0200 +++ trac-0.11.5/trac/mimeview/api.py 2009-09-28 22:02:35.000000000 +0200 @@ -579,7 +579,7 @@ annotators = ExtensionPoint(IHTMLPreviewAnnotator) converters = ExtensionPoint(IContentConverter) - default_charset = Option('trac', 'default_charset', 'iso-8859-15', + default_charset = Option('trac', 'default_charset', 'utf-8', """Charset to be used when in doubt.""") tab_width = IntOption('mimeviewer', 'tab_width', 8, python-patch-ng-1.17.4/tests/data/extended/000077500000000000000000000000001363443050500205025ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/data/extended/git-added-new-empty-file.diff000066400000000000000000000001251363443050500260140ustar00rootroot00000000000000diff --git a/new-file.txt b/new-file.txt new file mode 100644 index 0000000..e69de29 python-patch-ng-1.17.4/tests/data/extended/svn-added-new-empty-file.diff000066400000000000000000000001321363443050500260350ustar00rootroot00000000000000Index: new-file.txt =================================================================== python-patch-ng-1.17.4/tests/data/failing/000077500000000000000000000000001363443050500203135ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/data/failing/context-format.diff000066400000000000000000000015371363443050500241250ustar00rootroot00000000000000*** socketserver.py 2011-02-03 14:45:53.075396994 -0700 --- socketserver-new.py 2011-02-03 14:57:53.185396998 -0700 *************** *** 224,229 **** --- 224,232 ---- r, w, e = select.select([self], [], [], poll_interval) if self in r: self._handle_request_noblock() + + if getattr(self, "active_children", None) != None and len(self.active_children) > 0: + self.collect_children() finally: self.__shutdown_request = False self.__is_shut_down.set() *************** *** 521,527 **** def process_request(self, request, client_address): """Fork a new subprocess to process the request.""" - self.collect_children() pid = os.fork() if pid: # Parent process --- 524,529 ---- python-patch-ng-1.17.4/tests/data/failing/missing-hunk-line.diff000066400000000000000000000021241363443050500245050ustar00rootroot00000000000000Index: codereview/urls.py =================================================================== --- codereview/urls.py (revision 646) +++ codereview/urls.py (working copy) @@ -76,7 +76,8 @@ (r'^_ah/xmpp/message/chat/', 'incoming_chat'), (r'^_ah/mail/(.*)', 'incoming_mail'), (r'^xsrf_token$', 'xsrf_token'), - (r'^static/upload.py$', 'customized_upload_py'), + # patching upload.py on the fly + (r'^dynamic/upload.py$', 'customized_upload_py'), (r'^search$', 'search'), ) Index: templates/use_uploadpy.html =================================================================== --- templates/use_uploadpy.html (revision 646) +++ templates/use_uploadpy.html (working copy) @@ -2,7 +2,7 @@ {%block body%}

Tired of uploading files through the form?

-

Download upload.py, a simple tool for +

Download upload.py, a simple tool for uploading diffs from a version control system to the codereview app.

Usage summary: ypython-patch-ng-1.17.4/tests/data/failing/non-empty-patch-for-empty-file.diff000066400000000000000000000010111363443050500270160ustar00rootroot00000000000000Index: upload.py =================================================================== --- upload.py (revision 623) +++ upload.py (working copy) @@ -393,6 +393,9 @@ ## elif e.code >= 500 and e.code < 600: ## # Server Error - try again. ## continue + elif e.code == 404: + ErrorExit("Error: RPC call to %s failed with status 404\n" + "Check upload server is valid - %s" % (request_path, self.host)) else: raise finally: python-patch-ng-1.17.4/tests/data/failing/not-a-patch.log000066400000000000000000000006371363443050500231370ustar00rootroot00000000000000*get* '220 ftp.**********.com MadGoat FTP server V2.5-3 ready.\r\n' *resp* '220 ftp.**********.com MadGoat FTP server V2.5-3 ready.' *welcome* '220 ftp.**********.com MadGoat FTP server V2.5-3 ready.' *cmd* u'USER *******' *put* u'USER *******\r\n' *get* '331 Username "*******" Okay, need password.\r\n' *resp* '331 Username "*******" Okay, need password.' *cmd* u'PASS *******' *put* u'PASS *******\r\n' python-patch-ng-1.17.4/tests/data/failing/upload.py000066400000000000000000000000001363443050500221370ustar00rootroot00000000000000python-patch-ng-1.17.4/tests/data/git-changed-2-files.diff000066400000000000000000000026551363443050500231550ustar00rootroot00000000000000diff --git a/jsonpickle/__init__.py b/jsonpickle/__init__.py index 22161dd..ea5ca6d 100644 --- a/jsonpickle/__init__.py +++ b/jsonpickle/__init__.py @@ -87,7 +87,12 @@ class JSONPluginMgr(object): self._decoders = {} ## Options to pass to specific encoders - self._encoder_options = {} + json_opts = ((), {'sort_keys': True}) + self._encoder_options = { + 'json': json_opts, + 'simplejson': json_opts, + 'django.util.simplejson': json_opts, + } ## The exception class that is thrown when a decoding error occurs self._decoder_exceptions = {} diff --git a/tests/jsonpickle_test.py b/tests/jsonpickle_test.py index c61dec4..09ba339 100644 --- a/tests/jsonpickle_test.py +++ b/tests/jsonpickle_test.py @@ -427,6 +427,15 @@ class PicklingTestCase(unittest.TestCase): inflated = self.unpickler.restore(flattened) self.assertEqual(obj, inflated) + def test_references(self): + obj_a = Thing('foo') + obj_b = Thing('bar') + coll = [obj_a, obj_b, obj_b] + flattened = self.pickler.flatten(coll) + inflated = self.unpickler.restore(flattened) + self.assertEqual(len(inflated), len(coll)) + for x in range(len(coll)): + self.assertEqual(repr(coll[x]), repr(inflated[x])) class JSONPickleTestCase(unittest.TestCase): def setUp(self): python-patch-ng-1.17.4/tests/data/git-changed-file.diff000066400000000000000000000026551363443050500226330ustar00rootroot00000000000000diff --git a/jsonpickle/__init__.py b/jsonpickle/__init__.py index 22161dd..ea5ca6d 100644 --- a/jsonpickle/__init__.py +++ b/jsonpickle/__init__.py @@ -87,7 +87,12 @@ class JSONPluginMgr(object): self._decoders = {} ## Options to pass to specific encoders - self._encoder_options = {} + json_opts = ((), {'sort_keys': True}) + self._encoder_options = { + 'json': json_opts, + 'simplejson': json_opts, + 'django.util.simplejson': json_opts, + } ## The exception class that is thrown when a decoding error occurs self._decoder_exceptions = {} diff --git a/tests/jsonpickle_test.py b/tests/jsonpickle_test.py index c61dec4..09ba339 100644 --- a/tests/jsonpickle_test.py +++ b/tests/jsonpickle_test.py @@ -427,6 +427,15 @@ class PicklingTestCase(unittest.TestCase): inflated = self.unpickler.restore(flattened) self.assertEqual(obj, inflated) + def test_references(self): + obj_a = Thing('foo') + obj_b = Thing('bar') + coll = [obj_a, obj_b, obj_b] + flattened = self.pickler.flatten(coll) + inflated = self.unpickler.restore(flattened) + self.assertEqual(len(inflated), len(coll)) + for x in range(len(coll)): + self.assertEqual(repr(coll[x]), repr(inflated[x])) class JSONPickleTestCase(unittest.TestCase): def setUp(self): python-patch-ng-1.17.4/tests/data/git-dash-in-filename.diff000066400000000000000000000007501363443050500234200ustar00rootroot00000000000000From fe0fecac607022e8a8017c5209b79e4fda342213 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Thu, 10 Dec 2015 13:40:30 +0100 Subject: [PATCH 2/2] modified hello-world.txt --- hello-world.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hello-world.txt b/hello-world.txt index 3b18e51..dcc4fd9 100644 --- a/hello-world.txt +++ b/hello-world.txt @@ -1 +1,3 @@ -hello world +hello world, +how are you? + -- 2.4.10 python-patch-ng-1.17.4/tests/data/hg-added-file.diff000066400000000000000000000034051363443050500221100ustar00rootroot00000000000000diff -r f51cb906c4ad -r 0260994e7b44 tests/utils.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/utils.py Sat Aug 06 07:26:28 2011 +0200 @@ -0,0 +1,55 @@ +# Copyright 2011 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Test utils.""" + +import os + +from google.appengine.ext import testbed + +from django.test import TestCase as _TestCase + + +class TestCase(_TestCase): + """Customized Django TestCase. + + This class disables the setup of Django features that are not + available on App Engine (e.g. fixture loading). And it initializes + the Testbad class provided by the App Engine SDK. + """ + + def _fixture_setup(self): # defined in django.test.TestCase + pass + + def _fixture_teardown(self): # defined in django.test.TestCase + pass + + def setUp(self): + super(TestCase, self).setUp() + self.testbed = testbed.Testbed() + self.testbed.activate() + self.testbed.init_datastore_v3_stub() + self.testbed.init_user_stub() + + def tearDown(self): + self.testbed.deactivate() + super(TestCase, self).tearDown() + + def login(self, email): + """Logs in a user identified by email.""" + os.environ['USER_EMAIL'] = email + + def logout(self): + """Logs the user out.""" + os.environ['USER_EMAIL'] = '' python-patch-ng-1.17.4/tests/data/hg-changed-2-files.diff000066400000000000000000000013241363443050500227600ustar00rootroot00000000000000diff -r b2d9961ff1f5 TODO --- a/TODO Sat Dec 26 16:36:37 2009 +0200 +++ b/TODO Sun Dec 27 22:28:17 2009 +0200 @@ -7,3 +7,7 @@ - remove files - svn diff - hg diff + +Source and target file conflicts: +- two same source files in the same patch +- one source and later one target file with the same name (that exists) diff -r b2d9961ff1f5 test commit/review system test --- a/test commit/review system test Sat Dec 26 16:36:37 2009 +0200 +++ b/test commit/review system test Sun Dec 27 22:28:17 2009 +0200 @@ -1,4 +1,4 @@ something to change in -this file -for review \ No newline at end of file +this file <-- this should be removed!!! ARRGH! BASTARD, HOW DARE YOU TO MESS WITH PROJECT HISTORY! +for review python-patch-ng-1.17.4/tests/data/hg-exported.diff000066400000000000000000000037571363443050500217760ustar00rootroot00000000000000# HG changeset patch # User ralf@brainbot.com # Date 1215097201 -7200 # Branch xmlrpc_repr # Node ID 2f52c1a4e3ff26d4d7b391e7851792d4e47d8017 # Parent 185779ba2591ba6249601209c8dd5750b6e14716 implement _Method.__repr__/__str__ diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -639,9 +639,31 @@ os.remove("xmldata.txt") os.remove(test_support.TESTFN) +class ReprTest(unittest.TestCase): + """ + calling repr/str on a _Method object should not consult the xmlrpc server + (http://bugs.python.org/issue1690840) + """ + def _make_method(self): + """return a _Method object, which when called raises a RuntimeError""" + def _raise_error(*args): + raise RuntimeError("called") + return xmlrpclib._Method(_raise_error, 'test') + + def test_method_repr(self): + m = self._make_method() + repr(m) + repr(xmlrpclib.ServerProxy('http://localhost:8000').doit) + + + def test_method_str(self): + m = self._make_method() + str(m) + str(xmlrpclib.ServerProxy('http://localhost:8000').doit) + def test_main(): xmlrpc_tests = [XMLRPCTestCase, HelperTestCase, DateTimeTestCase, - BinaryTestCase, FaultTestCase] + BinaryTestCase, FaultTestCase, ReprTest] # The test cases against a SimpleXMLRPCServer raise a socket error # 10035 (WSAEWOULDBLOCK) in the server thread handle_request call when diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py --- a/Lib/xmlrpclib.py +++ b/Lib/xmlrpclib.py @@ -1191,7 +1191,10 @@ return _Method(self.__send, "%s.%s" % (self.__name, name)) def __call__(self, *args): return self.__send(self.__name, args) - + def __repr__(self): + return "<%s.%s %s %s>" % (self.__class__.__module__, self.__class__.__name__, self.__name, self.__send) + __str__ = __repr__ + ## # Standard transport class for XML-RPC over HTTP. #

python-patch-ng-1.17.4/tests/data/svn-added-new-file-withcontent.diff000066400000000000000000000003231363443050500254470ustar00rootroot00000000000000Index: new-file.txt =================================================================== --- new-file.txt (revision 0) +++ new-file.txt (revision 0) @@ -0,0 +1 @@ +with content \ No newline at end of file python-patch-ng-1.17.4/tests/data/svn-changed-2-files.diff000066400000000000000000000075711363443050500232020ustar00rootroot00000000000000Index: trac/versioncontrol/svn_fs.py =================================================================== --- trac/versioncontrol/svn_fs.py (revision 8986) +++ trac/versioncontrol/svn_fs.py (working copy) @@ -289,7 +289,7 @@ repos = fs_repos else: repos = CachedRepository(self.env.get_db_cnx, fs_repos, None, - self.log) + self.log, self.env) repos.has_linear_changesets = True if authname: authz = SubversionAuthorizer(self.env, weakref.proxy(repos), Index: trac/versioncontrol/cache.py =================================================================== --- trac/versioncontrol/cache.py (revision 8986) +++ trac/versioncontrol/cache.py (working copy) @@ -18,7 +18,7 @@ import os import posixpath -from trac.core import TracError +from trac.core import * from trac.util.datefmt import utc, to_timestamp from trac.util.translation import _ from trac.versioncontrol import Changeset, Node, Repository, Authorizer, \ @@ -36,19 +36,42 @@ CACHE_METADATA_KEYS = (CACHE_REPOSITORY_DIR, CACHE_YOUNGEST_REV) +class ICacheChangesetListener(Interface): + """Cached changeset operations""" + + def edit_changeset(cset): + """Called when changeset is about to be cached. + Returns altered data to cache or None if unchanged. cset usually + contains cset.date, cset.author, cset.message and cset.rev + """ + +class CacheManager(Component): + """Provide interface to plug-in into cache operations""" + + observers = ExtensionPoint(ICacheChangesetListener) + + def check_changeset(self, cset): + for observer in self.observers: + res = observer.edit_changeset(cset) + if res != None: + cset = res + return cset + + class CachedRepository(Repository): has_linear_changesets = False scope = property(lambda self: self.repos.scope) - def __init__(self, getdb, repos, authz, log): + def __init__(self, getdb, repos, authz, log, env): Repository.__init__(self, repos.name, authz, log) if callable(getdb): self.getdb = getdb else: self.getdb = lambda: getdb self.repos = repos + self.cache_mgr = CacheManager(env) def close(self): self.repos.close() @@ -77,6 +100,7 @@ def sync_changeset(self, rev): cset = self.repos.get_changeset(rev) + cset = self.cache_mgr.check_changeset(cset) db = self.getdb() cursor = db.cursor() cursor.execute("UPDATE revision SET time=%s, author=%s, message=%s " @@ -182,6 +206,7 @@ self.log.info("Trying to sync revision [%s]" % next_youngest) cset = self.repos.get_changeset(next_youngest) + cset = self.cache_mgr.check_changeset(cset) try: cursor.execute("INSERT INTO revision " " (rev,time,author,message) " python-patch-ng-1.17.4/tests/data/svn-modified-empty-file.diff000066400000000000000000000003121363443050500241650ustar00rootroot00000000000000Index: upload.py =================================================================== --- upload.py (revision 120) +++ upload.py (working copy) @@ -0,0 +1 @@ +new info \ No newline at end of file python-patch-ng-1.17.4/tests/recoverage.bat000066400000000000000000000001731363443050500206040ustar00rootroot00000000000000cd .. python -m coverage run tests/run_tests.py python -m coverage html -d tests/coverage python -m coverage report -m python-patch-ng-1.17.4/tests/run_tests.py000077500000000000000000000425661363443050500204110ustar00rootroot00000000000000#!/usr/bin/env python """ python-patch test suite There are two kind of tests: - file-based tests - directory-based tests - unit tests File-based test is patch file, initial file and resulting file for comparison. Directory-based test is a self-sufficient directory with: files to be patched, patch file itself and [result] dir. You can manually apply patch and compare outcome with [result] directory. This is what this test runner does. Unit tests test API and are all inside this runner. == Code Coverage == To refresh code coverage stats, get 'coverage' tool from http://pypi.python.org/pypi/coverage/ and run this file with: coverage run run_tests.py coverage html -d coverage On Windows it may be more convenient instead of `coverage` call `python -m coverage.__main__` """ from __future__ import print_function import os import sys import re import shutil import unittest import copy import stat from os import listdir, chmod from os.path import abspath, dirname, exists, join, isdir, isfile from tempfile import mkdtemp try: getcwdu = os.getcwdu except AttributeError: getcwdu = os.getcwd # python 3, where getcwd always returns a unicode object verbose = False if "-v" in sys.argv or "--verbose" in sys.argv: verbose = True # full path for directory with tests TESTS = dirname(abspath(__file__)) TESTDATA = join(TESTS, 'data') def testfile(name): return join(TESTDATA, name) # import patch_ng.py from parent directory save_path = sys.path sys.path.insert(0, dirname(TESTS)) import patch_ng sys.path = save_path # ---------------------------------------------------------------------------- class TestPatchFiles(unittest.TestCase): """ unittest hack - test* methods are generated by add_test_methods() function below dynamically using information about *.patch files from tests directory """ def _assert_files_equal(self, file1, file2): f1 = f2 = None try: f1 = open(file1, "rb") f2 = open(file2, "rb") for line in f1: self.assertEqual(line, f2.readline()) finally: if f2: f2.close() if f1: f1.close() def _assert_dirs_equal(self, dir1, dir2, ignore=[]): """ compare dir2 with reference dir1, ignoring entries from supplied list """ # recursive if type(ignore) == str: ignore = [ignore] e2list = [en for en in listdir(dir2) if en not in ignore] for e1 in listdir(dir1): if e1 in ignore: continue e1path = join(dir1, e1) e2path = join(dir2, e1) self.assertTrue(exists(e1path)) self.assertTrue(exists(e2path), "%s does not exist" % e2path) self.assertTrue(isdir(e1path) == isdir(e2path)) if not isdir(e1path): self._assert_files_equal(e1path, e2path) else: self._assert_dirs_equal(e1path, e2path, ignore=ignore) e2list.remove(e1) for e2 in e2list: self.fail("extra file or directory: %s" % e2) def _run_test(self, testname): """ boilerplate for running *.patch file tests """ # 1. create temp test directory # 2. copy files # 3. execute file-based patch # 4. compare results # 5. cleanup on success tmpdir = mkdtemp(prefix="%s."%testname) basepath = join(TESTS, testname) basetmp = join(tmpdir, testname) patch_file = basetmp + ".patch" file_based = isfile(basepath + ".from") from_tgt = basetmp + ".from" if file_based: shutil.copy(basepath + ".from", tmpdir) shutil.copy(basepath + ".patch", tmpdir) else: # directory-based for e in listdir(basepath): epath = join(basepath, e) if not isdir(epath): shutil.copy(epath, join(tmpdir, e)) else: shutil.copytree(epath, join(tmpdir, e)) # 3. # test utility as a whole patch_tool = join(dirname(TESTS), "patch_ng.py") save_cwd = getcwdu() os.chdir(tmpdir) extra = "-f" if "10fuzzy" in testname else "" if verbose: cmd = '%s %s %s "%s"' % (sys.executable, patch_tool, extra, patch_file) print("\n"+cmd) else: cmd = '%s %s -q %s "%s"' % (sys.executable, patch_tool, extra, patch_file) ret = os.system(cmd) assert ret == 0, "Error %d running test %s" % (ret, testname) os.chdir(save_cwd) # 4. # compare results if file_based: self._assert_files_equal(basepath + ".to", from_tgt) else: # recursive comparison self._assert_dirs_equal(join(basepath, "[result]"), tmpdir, ignore=["%s.patch" % testname, ".svn", ".gitkeep", "[result]"]) remove_tree_force(tmpdir) return 0 def add_test_methods(cls): """ hack to generate test* methods in target class - one for each *.patch file in tests directory """ # list testcases - every test starts with number # and add them as test* methods testptn = re.compile(r"^(?P\d{2,}[^\.]+).*$") testset = [testptn.match(e).group('name') for e in listdir(TESTS) if testptn.match(e)] testset = sorted(set(testset)) for filename in testset: methname = 'test_' + filename def create_closure(): name = filename return lambda self: self._run_test(name) test = create_closure() setattr(cls, methname, test) if verbose: print("added test method %s to %s" % (methname, cls)) add_test_methods(TestPatchFiles) # ---------------------------------------------------------------------------- class TestCheckPatched(unittest.TestCase): def setUp(self): self.save_cwd = getcwdu() os.chdir(TESTS) def tearDown(self): os.chdir(self.save_cwd) def test_patched_multipatch(self): pto = patch_ng.fromfile("01uni_multi/01uni_multi.patch") os.chdir(join(TESTS, "01uni_multi", "[result]")) self.assertTrue(pto.can_patch(b"updatedlg.cpp")) def test_can_patch_single_source(self): pto2 = patch_ng.fromfile("02uni_newline.patch") self.assertTrue(pto2.can_patch(b"02uni_newline.from")) def test_can_patch_fails_on_target_file(self): pto3 = patch_ng.fromfile("03trail_fname.patch") self.assertEqual(None, pto3.can_patch(b"03trail_fname.to")) self.assertEqual(None, pto3.can_patch(b"not_in_source.also")) def test_multiline_false_on_other_file(self): pto = patch_ng.fromfile("01uni_multi/01uni_multi.patch") os.chdir(join(TESTS, "01uni_multi")) self.assertFalse(pto.can_patch(b"updatedlg.cpp")) def test_single_false_on_other_file(self): pto3 = patch_ng.fromfile("03trail_fname.patch") self.assertFalse(pto3.can_patch("03trail_fname.from")) def test_can_patch_checks_source_filename_even_if_target_can_be_patched(self): pto2 = patch_ng.fromfile("04can_patch.patch") self.assertFalse(pto2.can_patch("04can_patch_ng.to")) # ---------------------------------------------------------------------------- class TestPatchParse(unittest.TestCase): def test_fromstring(self): try: f = open(join(TESTS, "01uni_multi/01uni_multi.patch"), "rb") readstr = f.read() finally: f.close() pst = patch_ng.fromstring(readstr) self.assertEqual(len(pst), 5) def test_fromfile(self): pst = patch_ng.fromfile(join(TESTS, "01uni_multi/01uni_multi.patch")) self.assertNotEqual(pst, False) self.assertEqual(len(pst), 5) ps2 = patch_ng.fromfile(testfile("failing/not-a-patch.log")) self.assertFalse(ps2) def test_no_header_for_plain_diff_with_single_file(self): pto = patch_ng.fromfile(join(TESTS, "03trail_fname.patch")) self.assertEqual(pto.items[0].header, []) def test_header_for_second_file_in_svn_diff(self): pto = patch_ng.fromfile(join(TESTS, "01uni_multi/01uni_multi.patch")) self.assertEqual(pto.items[1].header[0], b'Index: updatedlg.h\r\n') self.assertTrue(pto.items[1].header[1].startswith(b'=====')) def test_hunk_desc(self): pto = patch_ng.fromfile(testfile('git-changed-file.diff')) self.assertEqual(pto.items[0].hunks[0].desc, b'class JSONPluginMgr(object):') def test_autofixed_absolute_path(self): pto = patch_ng.fromfile(join(TESTS, "data/autofix/absolute-path.diff")) self.assertEqual(pto.errors, 0) self.assertEqual(pto.warnings, 9) self.assertEqual(pto.items[0].source, b"winnt/tests/run_tests.py") def test_autofixed_parent_path(self): # [ ] exception vs return codes for error recovery # [x] separate return code when patch lib compensated the error # (implemented as warning count) pto = patch_ng.fromfile(join(TESTS, "data/autofix/parent-path.diff")) self.assertEqual(pto.errors, 0) self.assertEqual(pto.warnings, 4) self.assertEqual(pto.items[0].source, b"patch_ng.py") def test_autofixed_stripped_trailing_whitespace(self): pto = patch_ng.fromfile(join(TESTS, "data/autofix/stripped-trailing-whitespace.diff")) self.assertEqual(pto.errors, 0) self.assertEqual(pto.warnings, 4) def test_fail_missing_hunk_line(self): fp = open(join(TESTS, "data/failing/missing-hunk-line.diff"), 'rb') pto = patch_ng.PatchSet() self.assertNotEqual(pto.parse(fp), True) fp.close() def test_fail_context_format(self): fp = open(join(TESTS, "data/failing/context-format.diff"), 'rb') res = patch_ng.PatchSet().parse(fp) self.assertFalse(res) fp.close() def test_fail_not_a_patch(self): fp = open(join(TESTS, "data/failing/not-a-patch.log"), 'rb') res = patch_ng.PatchSet().parse(fp) self.assertFalse(res) fp.close() def test_diffstat(self): output = """\ updatedlg.cpp | 20 ++++++++++++++++++-- updatedlg.h | 1 + manifest.xml | 15 ++++++++------- conf.cpp | 23 +++++++++++++++++------ conf.h | 7 ++++--- 5 files changed, 48 insertions(+), 18 deletions(-), +1203 bytes""" pto = patch_ng.fromfile(join(TESTS, "01uni_multi/01uni_multi.patch")) self.assertEqual(pto.diffstat(), output, "Output doesn't match") class TestPatchSetDetection(unittest.TestCase): def test_svn_detected(self): pto = patch_ng.fromfile(join(TESTS, "01uni_multi/01uni_multi.patch")) self.assertEqual(pto.type, patch_ng.SVN) # generate tests methods for TestPatchSetDetection - one for each patch file def generate_detection_test(filename, patchtype): # saving variable in local scope to prevent test() # from fetching it from global patchtype = difftype def test(self): pto = patch_ng.fromfile(join(TESTDATA, filename)) self.assertEqual(pto.type, patchtype) return test for filename in os.listdir(TESTDATA): if isdir(join(TESTDATA, filename)): continue difftype = patch_ng.PLAIN if filename.startswith('git-'): difftype = patch_ng.GIT if filename.startswith('hg-'): difftype = patch_ng.HG if filename.startswith('svn-'): difftype = patch_ng.SVN name = 'test_'+filename test = generate_detection_test(filename, difftype) setattr(TestPatchSetDetection, name, test) if verbose: print("added test method %s to %s" % (name, 'TestPatchSetDetection')) class TestPatchApply(unittest.TestCase): def setUp(self): self.save_cwd = getcwdu() self.tmpdir = mkdtemp(prefix=self.__class__.__name__) os.chdir(self.tmpdir) def tearDown(self): os.chdir(self.save_cwd) remove_tree_force(self.tmpdir) def tmpcopy(self, filenames): """copy file(s) from test_dir to self.tmpdir""" for f in filenames: shutil.copy(join(TESTS, f), self.tmpdir) def test_apply_returns_false_on_failure(self): self.tmpcopy(['data/failing/non-empty-patch-for-empty-file.diff', 'data/failing/upload.py']) pto = patch_ng.fromfile('non-empty-patch-for-empty-file.diff') self.assertFalse(pto.apply()) def test_apply_returns_true_on_success(self): self.tmpcopy(['03trail_fname.patch', '03trail_fname.from']) pto = patch_ng.fromfile('03trail_fname.patch') self.assertTrue(pto.apply()) def test_revert(self): def get_file_content(filename): with open(filename, 'rb') as f: return f.read() self.tmpcopy(['03trail_fname.patch', '03trail_fname.from']) pto = patch_ng.fromfile('03trail_fname.patch') self.assertTrue(pto.apply()) self.assertNotEqual(get_file_content(self.tmpdir + '/03trail_fname.from'), get_file_content(TESTS + '/03trail_fname.from')) self.assertTrue(pto.revert()) self.assertEqual(get_file_content(self.tmpdir + '/03trail_fname.from'), get_file_content(TESTS + '/03trail_fname.from')) def test_apply_root(self): treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '06nested'), treeroot) pto = patch_ng.fromfile(join(TESTS, '06nested/06nested.patch')) self.assertTrue(pto.apply(root=treeroot)) def test_apply_strip(self): treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '06nested'), treeroot) pto = patch_ng.fromfile(join(TESTS, '06nested/06nested.patch')) for p in pto: p.source = b'nasty/prefix/' + p.source p.target = b'nasty/prefix/' + p.target self.assertTrue(pto.apply(strip=2, root=treeroot)) def test_create_file(self): treeroot = join(self.tmpdir, 'rootparent') os.makedirs(treeroot) pto = patch_ng.fromfile(join(TESTS, '08create/08create.patch')) pto.apply(strip=0, root=treeroot) self.assertTrue(os.path.exists(os.path.join(treeroot, 'created'))) def test_delete_file(self): treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '09delete'), treeroot) pto = patch_ng.fromfile(join(TESTS, '09delete/09delete.patch')) pto.apply(strip=0, root=treeroot) self.assertFalse(os.path.exists(os.path.join(treeroot, 'deleted'))) def test_fuzzy_patch_both(self): treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '10fuzzy'), treeroot) pto = patch_ng.fromfile(join(TESTS, '10fuzzy/10fuzzy.patch')) self.assertTrue(pto.apply(root=treeroot, fuzz=True)) self.assertFalse(pto.apply(root=treeroot, fuzz=False)) def test_fuzzy_patch_before(self): treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '10fuzzybefore'), treeroot) pto = patch_ng.fromfile(join(TESTS, '10fuzzybefore/10fuzzybefore.patch')) self.assertTrue(pto.apply(root=treeroot, fuzz=True)) self.assertFalse(pto.apply(root=treeroot, fuzz=False)) def test_fuzzy_patch_after(self): treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '10fuzzyafter'), treeroot) pto = patch_ng.fromfile(join(TESTS, '10fuzzyafter/10fuzzyafter.patch')) self.assertTrue(pto.apply(root=treeroot, fuzz=True)) self.assertFalse(pto.apply(root=treeroot, fuzz=False)) def test_unlink_backup_windows(self): """ Apply patch to a read-only file and don't change its filemode """ treeroot = join(self.tmpdir, 'rootparent') shutil.copytree(join(TESTS, '11permission'), treeroot) pto = patch_ng.fromfile(join(TESTS, '11permission', '11permission.patch')) some_file = join(treeroot, 'some_file') chmod(some_file, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH) self.assertTrue(pto.apply(root=treeroot)) self.assertTrue(os.stat(some_file).st_mode, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH) class TestHelpers(unittest.TestCase): # unittest setting longMessage = True absolute = [b'/', b'c:\\', b'c:/', b'\\', b'/path', b'c:\\path'] relative = [b'path', b'path:\\', b'path:/', b'path\\', b'path/', b'path\\path'] def test_xisabs(self): for path in self.absolute: self.assertTrue(patch_ng.xisabs(path), 'Target path: ' + repr(path)) for path in self.relative: self.assertFalse(patch_ng.xisabs(path), 'Target path: ' + repr(path)) def test_xnormpath(self): path = b"../something/..\\..\\file.to.patch" self.assertEqual(patch_ng.xnormpath(path), b'../../file.to.patch') def test_xstrip(self): for path in self.absolute[:4]: self.assertEqual(patch_ng.xstrip(path), b'') for path in self.absolute[4:6]: self.assertEqual(patch_ng.xstrip(path), b'path') # test relative paths are not affected for path in self.relative: self.assertEqual(patch_ng.xstrip(path), path) def test_pathstrip(self): self.assertEqual(patch_ng.pathstrip(b'path/to/test/name.diff', 2), b'test/name.diff') self.assertEqual(patch_ng.pathstrip(b'path/name.diff', 1), b'name.diff') self.assertEqual(patch_ng.pathstrip(b'path/name.diff', 0), b'path/name.diff') def remove_tree_force(folder): for root, _, files in os.walk(folder): for it in files: chmod(os.path.join(root, it), stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH) shutil.rmtree(folder, ignore_errors=True) # ---------------------------------------------------------------------------- if __name__ == '__main__': unittest.main()