Control: tags 936729 + patch Control: tags 936729 + pending Dear maintainer,
I've prepared an NMU for imgsizer (versioned as 2.10-0.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru imgsizer-2.7/control imgsizer-2.10/control --- imgsizer-2.7/control 1970-01-01 02:00:00.000000000 +0200 +++ imgsizer-2.10/control 2019-06-12 17:36:12.000000000 +0300 @@ -0,0 +1,25 @@ +# This is not a real Debian control file, though the syntax is compatible. +# It's project metadata for the shipper tool + +Package: imgsizer + +Description: Fill in WIDTH and HEIGHT attributes for IMG tags. + This tool auto-generates or corrects WIDTH and HEIGHT parameters + into HTML IMG tags, making page loading faster. + +XBS-Destinations: [email protected] + +Homepage: http://www.catb.org/~esr/imgsizer + +X-Repository-URL: https://gitlab.com/esr/imgsizer + +XBS-HTML-Target: index.html + +XBS-Debian-Packages: imgsizer + +XBS-Logo: crate.png + +#XBS-Project-Tags: HTML + +XBS-VC-Tag-Template: %(version)s + diff -Nru imgsizer-2.7/COPYING imgsizer-2.10/COPYING --- imgsizer-2.7/COPYING 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/COPYING 2019-06-12 17:36:12.000000000 +0300 @@ -1,340 +1,27 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + BSD LICENSE - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright (c) 2015, Eric S. Raymond +All rights reserved. - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. 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. + +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 +HOLDER 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. Binary files /tmp/NFisNRLAXS/imgsizer-2.7/crate.jpg and /tmp/ux7JWgdmWM/imgsizer-2.10/crate.jpg differ Binary files /tmp/NFisNRLAXS/imgsizer-2.7/crate.png and /tmp/ux7JWgdmWM/imgsizer-2.10/crate.png differ diff -Nru imgsizer-2.7/debian/changelog imgsizer-2.10/debian/changelog --- imgsizer-2.7/debian/changelog 2019-12-23 22:57:35.000000000 +0200 +++ imgsizer-2.10/debian/changelog 2019-12-23 22:57:35.000000000 +0200 @@ -1,3 +1,12 @@ +imgsizer (2.10-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release. + * Use Python 3. (Closes: #936729) + * debian/control: Add Homepage. + + -- Adrian Bunk <[email protected]> Mon, 23 Dec 2019 16:40:54 +0200 + imgsizer (2.7-3) unstable; urgency=low * Bug fix: "imgsizer: Doesn't conform to the python policy", thanks diff -Nru imgsizer-2.7/debian/control imgsizer-2.10/debian/control --- imgsizer-2.7/debian/control 2019-12-23 22:57:35.000000000 +0200 +++ imgsizer-2.10/debian/control 2019-12-23 22:57:35.000000000 +0200 @@ -4,10 +4,11 @@ Maintainer: Peter S Galbraith <[email protected]> Build-Depends: debhelper Standards-Version: 3.7.2 +Homepage: http://www.catb.org/~esr/imgsizer/ Package: imgsizer Architecture: all -Depends: imagemagick | file, imagemagick | libjpeg-progs, python (>= 2.4) +Depends: imagemagick | file, imagemagick | libjpeg-progs, python3 Description: Adds WIDTH and HEIGHT attributes to IMG tags in HTML files The imgsizer script automates away the tedious task of creating and updating the extension HEIGHT and WIDTH parameters in HTML IMG tags. diff -Nru imgsizer-2.7/imgsizer imgsizer-2.10/imgsizer --- imgsizer-2.7/imgsizer 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/imgsizer 2019-12-23 22:57:35.000000000 +0200 @@ -1,16 +1,16 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # imgsizer -- correct image sizes in WWW pages # by Eric S. Raymond <[email protected]> -# +# # Fix up IMG tags in given documents to contain correct sizes. -# -# Works with Python 1.5.2 # -# Copy, use, and redistribute freely, but don't take my name off it and -# clearly mark an altered version. Fixes and enhancements cheerfully -# accepted. +# This code runs under either Python 2 or Python 3. Keep it that way! +# +# SPDX-License-Identifier: BSD-2-clause # +from __future__ import print_function + # Changelog: # # Originally created by Eric S. Raymond <[email protected]> 30 Jul 1996 @@ -71,18 +71,25 @@ # # Added support for the Python Imaging Library to determine size in case of # failure from file(1), rdjpgcom(1) and identify(1). +# +# SPDX-License-Identifier: BSD-2-Clause -import sys, os, getopt, string, re, urllib, commands +import sys, os, getopt, string, re, filecmp + +# Warning: In some Python 3 versions getstatusoutput() returns +# status incorrectly so that a nonzero exit looks like the subprocess +# was signaled! (Observed under 3.4.3; Debian bug #764848) +try: + from subprocess import getstatusoutput +except ImportError: + from commands import getstatusoutput -# Arrange for both 1.5 and 2.1 compatibility try: - import filecmp - cmp = filecmp - del filecmp + from urllib.request import urlretrieve except ImportError: - import cmp + from urllib import urlretrieve -version = "2.7, 05 Aug 2004"; +version = "2.10" splash = """imgsizer version %s, Eric S. Raymond <[email protected]> See <http://www.catb.org/~esr/software.html> for updates.""" @@ -117,10 +124,11 @@ pythonimage = 1 # use python imaging library def attrformat(xc, dim): + "Formst an attrubute" if lower: res = " " + dim else: - res = " " + string.upper(dim) + res = " " + dim.upper() res = res + '="' + str(xc) + '"' return res @@ -145,7 +153,6 @@ continue # within an image tag lower = (lead == 'img') - state = suppress = 0 attributes = "" while 1: ch = infp.read(1) @@ -161,28 +168,30 @@ attributes = attributes + ch outfp.write(transform(attributes) + ch) -x_match = re.compile (r" ([0-9]+) *x *([0-9]+)") -rdjpg_match = re.compile (r" ([0-9]+)w *\* *([0-9]+)h") +x_match = re.compile(r" ([0-9]+) *x *([0-9]+)") +rdjpg_match = re.compile(r" ([0-9]+)w *\* *([0-9]+)h") def imgsize(src): "Return the image size in pixels for a given image source." global magick, rdjpgcom, pythonimage try: - (filename, headers) = urllib.urlretrieve(src) + if not ":" in src: + src = "file:" + src + (filename, _headers) = urlretrieve(src) except IOError: return None # Now let's see if we can get a size for the retrieved image. # Try file(1) first -- cheapest, as it doesn't read the whole image - (status, output) = commands.getstatusoutput("file " + filename) + (status, output) = getstatusoutput("file " + filename) if status == 0: # file(1) works for every common image format other than JPEG - if string.find(output, "JPEG") == -1: + if output.find("JPEG") == -1: sizes = x_match.search(output) if sizes: return (sizes.group(1), sizes.group(2)) elif rdjpgcom: # Use rdjpgcom(1) to handle JPEGs - (status, output) = commands.getstatusoutput("rdjpgcom -verbose " + filename) + (status, output) = getstatusoutput("rdjpgcom -verbose " + filename) sizes = rdjpg_match.search(output) if sizes: return (sizes.group(1), sizes.group(2)) @@ -190,7 +199,7 @@ rdjpgcom = 0 # Next try identify(1), more expensive but bulletproof if magick: - (status, output) = commands.getstatusoutput("identify " + filename) + (status, output) = getstatusoutput("identify " + filename) if status == 0: sizes = x_match.search(output) if sizes: @@ -202,18 +211,17 @@ # open doesn't actually load all the data, so it shouldn't be too expensive if pythonimage: try: - import Image - pyimg = Image.open(filename) - return pyimg.size + import Image + pyimg = Image.open(filename) + return pyimg.size except (ImportError, IOError): - sys.stderr.write("imgsizer: giving up on Python Imaging Library\n") - pythonimage = 0 - pass + sys.stderr.write("imgsizer: giving up on Python Imaging Library\n") + pythonimage = 0 # All attempts failed sys.stderr.write("imgsizer: couldn't analyze %s\n" % src) -source = re.compile('SRC\s*=\s*"?([^" \t\n]*)"?', re.I) +source = re.compile(r'SRC\s*=\s*"?([^" \t\n]*)"?', re.I) awidth = re.compile(r' *WIDTH\s*=\s*"?[0-9]*"?', re.I) aheight = re.compile(r' *HEIGHT\s*=\s*"?[0-9]*"?', re.I) pwidth = re.compile(r'WIDTH\s*=\s*"?[0-9]*%"?', re.I) @@ -242,17 +250,16 @@ # Compute image dimensions (xc, yc) = dimensions # Plug in the new attr - return attr + attrformat(xc, "width") + attrformat(yc, "height") + return attr + attrformat(xc, "width") + attrformat(yc, "height") -# Output uppercase tags, surrounded by quotes, by default. -lower = 0 -quotes = 1 +# Output lowercase tags by default. +lower = 1 # Set the default DocumentRoot to the current working directory. root = "." out = "imgsizer-out$$" -dir = "." # NOTE: if you are doing <yourfile make sure that pwd is correct! +mydir = "." # NOTE: if you are doing <yourfile make sure that pwd is correct! # Collect options from the environment first, then the command line options = os.environ.get("IMGSIZER") @@ -263,47 +270,47 @@ options = options + sys.argv[1:] # Process options -(options, arguments) = getopt.getopt(options, "Vhd:n", +(options, arguments) = getopt.getopt(options, "Vhd:n", \ ('version', 'help', 'usage', 'document=', 'no-overwrite')) no_overwrite = 0 for (switch, val) in options: if switch in ('-V', '--version'): - print splash % version + print(splash % version) raise SystemExit elif switch in ('-h', '--help', '--usage'): - print splash + "\n\n" + usage + print(splash + "\n\n" + usage) raise SystemExit elif switch in ('-d', '--document'): root = val if not os.path.isdir(root): - print "Document root isn't a directory" - raise SystemExit, 1 + print("Document root isn't a directory") + raise SystemExit(1) elif switch in ('-n', '--no-overwrite'): no_overwrite = 1 if not arguments: sizefix(sys.stdin, sys.stdout) else: - for file in arguments: + for myfile in arguments: try: - infp = open(file) + infp = open(myfile) except: - print "imgsizer: can't open input file", file - raise SystemExit, 1 - tempfile = file + ".~imgsizer-%d~" % os.getpid() + print("imgsizer: can't open input file", myfile) + raise SystemExit(1) + tempfile = myfile + ".~imgsizer-%d~" % os.getpid() try: outfp = open(tempfile, "w") except OSError: - print "imgsizer: can't open tempfile" - raise SystemExit, 1 + print("imgsizer: can't open tempfile") + raise SystemExit(1) sizefix(infp, outfp) - if cmp.cmp(file, tempfile): + if filecmp.cmp(myfile, tempfile): os.remove(tempfile) else: try: - os.rename(tempfile, file) + os.rename(tempfile, myfile) except OSError: - sys.stderr.write("imgsize: couldn't replace " + file) + sys.stderr.write("imgsize: couldn't replace " + myfile) os.remove(tempfile) # End diff -Nru imgsizer-2.7/imgsizer.1 imgsizer-2.10/imgsizer.1 --- imgsizer-2.7/imgsizer.1 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/imgsizer.1 2019-06-12 17:36:12.000000000 +0300 @@ -1,101 +1,120 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "IMGSIZER" 1 "" "" "" -.SH NAME +'\" t +.\" Title: imgsizer +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Date: 03/20/2019 +.\" Manual: Web Tools +.\" Source: imgsizer +.\" Language: English +.\" +.TH "IMGSIZER" "1" "03/20/2019" "imgsizer" "Web Tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" imgsizer \- automatically splice in height and width params for HTML IMG tags .SH "SYNOPSIS" -.ad l -.hy 0 -.HP 9 +.HP \w'\fBimgsizer\fR\ 'u \fBimgsizer\fR [\fB\-d\fR\ \fIfile\fR] [\-\-document\-root\ \fIfile\fR] [\fB\-h\fR\ \fIfile\fR] [\-\-help\ \fIfile\fR] [\fB\-n\fR] [\fB\-\-no\-overwrite\fR] [\fIHTMLFile\fR] [\fB\-v\fR\ \fIfile\fR] [\-\-version] -.ad -.hy - .SH "OPTIONS" - -.TP -.ad l .hy 0 .HP 1 \-V, \-\-version .ad .hy +.PP +.HP \w'\ 'u \-V, \-\-version +.RS 4 Display version information and exit\&. - -.TP -.ad l .hy 0 .HP 1 \-h, \-\-help .ad .hy +.RE +.PP +.HP \w'\ 'u \-h, \-\-help +.RS 4 Display usage information\&. - -.TP -.ad l .hy 0 .HP 1 \-d\ \fI<directory>,\fR \-\-document\-root\ \fI<directory>\fR .ad .hy +.RE +.PP +.HP \w'\ 'u \-d\ \fI<directory>,\fR \-\-document\-root\ \fI<directory>\fR +.RS 4 Directory where absolute image filenames (i\&.e, ones which contain a leading "/") may be found\&. - -.TP -\-n, \-\-no\-overwwrite, \&.SH DESCRIPTION -The \fBimgsizer\fR script automates away the tedious task of creating and updating the extension HEIGHT and WIDTH parameters in HTML IMG tags\&. These parameters help many browsers (including the Netscape/Mozilla family) to multi\-thread image loading, instead of having to load images in strict sequence in order to have each one's dimensions available so the next can be placed\&. This generally allows text on the remainder of the page to load much faster\&. - +.RE +.PP +\fB\-n, \-\-no\-overwwrite\fR, \&.SH DESCRIPTION +.RS 4 +The +\fBimgsizer\fR +script automates away the tedious task of creating and updating the extension HEIGHT and WIDTH parameters in HTML IMG tags\&. These parameters help many browsers (including the Netscape/Mozilla family) to multi\-thread image loading, instead of having to load images in strict sequence in order to have each one\*(Aqs dimensions available so the next can be placed\&. This generally allows text on the remainder of the page to load much faster\&. +.RE .PP This script will try create such attributes for any IMG tag that lacks them\&. It will correct existing HEIGHT and WIDTH tags unless either contains a percent (%) sign, in which case the existing dimensions are presumed to be relative and left unaltered\&. - .PP This script may be called with no arguments\&. In this mode, it filters HTML presented on stdin to HTML (unaltered except for added or corrected HEIGHT and WIDTH attributes) on stdout\&. If called with file arguments, it will attempt to transform each file in place\&. Each argument file is not actually modified until the script completes a successful conversion pass\&. - .PP -The \fB\-d\fR <directory> option sets the DocumentRoot, where images with an absolute filename (i\&.e\&., ones which contain a leading "/") may be found\&. If none is specified, the DocumentRoot defaults to the current working directory\&. - +The +\fB\-d\fR +<directory> option sets the DocumentRoot, where images with an absolute filename (i\&.e\&., ones which contain a leading "/") may be found\&. If none is specified, the DocumentRoot defaults to the current working directory\&. .PP The \-n (no\-overwrite) opion prevents the program from overwriting existing width and height tags if both are present\&. - .PP -Additional options may also be specified in the environmental variable "IMGSIZER"\&. For example, to avoid typing "imgsizer \fB\-d\fR /var/www/docs" each time \fBimgsizer\fR is invoked, you might tell sh (or one of its descendants): - +Additional options may also be specified in the environmental variable "IMGSIZER"\&. For example, to avoid typing "imgsizer +\fB\-d\fR +/var/www/docs" each time +\fBimgsizer\fR +is invoked, you might tell sh (or one of its descendants): +.sp +.if n \{\ +.RS 4 +.\} .nf - IMGSIZER="\-d /var/www/docs"; export IMGSIZER - .fi - +.if n \{\ +.RE +.\} .PP or, if you use csh: - +.sp +.if n \{\ +.RS 4 +.\} .nf - setenv IMGSIZER "\-d /var/www/docs" - .fi - -.PP -This script is written in Python, and thus requires a Python interpreter on the host system\&. It also requires either the \fBidentify\fR(1) utility distributed in the open\-source ImageMagick suite of image\-display and manipulation tools, or a modern version of \fBfile\fR(1) and \fBrdjpgcom\fR(1)\&. These utilities are used to extract sizes from the images; \fBimgsizer\fR itself has no knowledge of graphics formats\&. The script will handle any image format known to \fBidentify\fR(1) including PNG, GIF, JPEG, XBM, XPM, PostScript, BMP, TIFF, and anything else even remotely likely to show up as an inline image\&. - +.if n \{\ +.RE +.\} +.PP +This script is written in Python, and thus requires a Python interpreter on the host system\&. It also requires either the +\fBidentify\fR(1) +utility distributed in the open\-source ImageMagick suite of image\-display and manipulation tools, or a modern version of +\fBfile\fR(1) +and +\fBrdjpgcom\fR(1)\&. These utilities are used to extract sizes from the images; +\fBimgsizer\fR +itself has no knowledge of graphics formats\&. The script will handle any image format known to +\fBidentify\fR(1) +including PNG, GIF, JPEG, XBM, XPM, PostScript, BMP, TIFF, and anything else even remotely likely to show up as an inline image\&. .SH "NOTE" - .PP The \-q, \-l, and \-m options of the 1\&.0 versions are gone\&. What they used to do has been made unnecessary by smarter logic\&. - .SH "BUGS" - .PP The code uses regular expressions rather than true HTML/XML parsing\&. Some perverse but legal constructions, like extraneous space within quoted numeric attributes, will be mangled\&. - .SH "AUTHOR" - .PP -Originally created by Eric S\&. Raymond <esr@thyrsus\&.com>\&. Additional code contributed by Erik Rossen, Michael C\&. Toren <michael@toren\&.net>, and others\&. For updates, see <http://www\&.catb\&.org/~esr: \fIhttp://www.catb.org/~esr\fR> - +Originally created by Eric S\&. Raymond <esr@thyrsus\&.com>\&. Additional code contributed by Erik Rossen, Michael C\&. Toren <michael@toren\&.net>, and others\&. For updates, see <\m[blue]\fBhttp://www\&.catb\&.org/~esr\fR\m[]> .SH "SEE ALSO" - .PP -\fBidentify\fR(1), \fBfile\fR(1), rdjpgcom(1)\&. - +\fBidentify\fR(1), +\fBfile\fR(1), +\fIrdjpgcom(1)\&.\fR diff -Nru imgsizer-2.7/imgsizer.spec imgsizer-2.10/imgsizer.spec --- imgsizer-2.7/imgsizer.spec 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/imgsizer.spec 1970-01-01 02:00:00.000000000 +0200 @@ -1,46 +0,0 @@ -Name: imgsizer -Version: 2.7 -Release: 1 -Summary: compute WIDTH and HEIGHT attribues for IMG tags -URL: http://www.catb.org/~esr/imgsizer/ -Source: %{name}-%{version}.tar.gz -License: MIT-like -Group: Utilities/System -BuildRoot: %{_tmppath}/%{name}-root -#Keywords: web, images, optimization - -%description -This tool auto-generates or corrects WIDTH and HEIGHT parameters -into HTML IMG tags, making page loading faster. - -%prep -%setup -q - -%build -make %{?_smp_mflags} imgsizer.1 - -%install -[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p "$RPM_BUILD_ROOT"%{_bindir} -mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1/ -cp imgsizer "$RPM_BUILD_ROOT"%{_bindir} -cp imgsizer.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/ - -%clean -[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" - -%files -%doc README COPYING -%defattr(-,root,root,-) -%{_mandir}/man1/imgsizer.1* -%{_bindir}/imgsizer - -%changelog -* Thu Aug 5 2004 Eric S. Raymond <[email protected]> - 2.7-1 -- Added capability to use PIL if both file(1) and identify(1) fail. - Added BUGS section to manual page. - -* Mon Dec 29 2003 Eric S. Raymond <[email protected]> 2.6-1 -- Source RPMs no longer depend on --define myversion. - - diff -Nru imgsizer-2.7/imgsizer.xml imgsizer-2.10/imgsizer.xml --- imgsizer-2.7/imgsizer.xml 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/imgsizer.xml 2019-06-12 17:36:12.000000000 +0300 @@ -7,6 +7,9 @@ <refentrytitle>imgsizer</refentrytitle> <manvolnum>1</manvolnum> <refmiscinfo class='date'>6 Sep 2001</refmiscinfo> +<refmiscinfo class='productname'>imgsizer</refmiscinfo> +<refmiscinfo class='source'>imgsizer</refmiscinfo> +<refmiscinfo class='manual'>Web Tools</refmiscinfo> </refmeta> <refnamediv id='name'> <refname>imgsizer</refname> diff -Nru imgsizer-2.7/Makefile imgsizer-2.10/Makefile --- imgsizer-2.7/Makefile 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/Makefile 2019-06-12 17:36:12.000000000 +0300 @@ -1,5 +1,7 @@ # Makefile for the imgsizer distribution -VERS=$(shell sed <imgsizer.spec -n -e '/Version: \(.*\)/s//\1/p') + +# Change this in NEWS file, too +VERS=$(shell sed <imgsizer -n -e '/version *= *\"\(.*\)\"/s//\1/p') # These choices are correct for Linux. Season to taste. BINDIR = /usr/bin @@ -13,16 +15,19 @@ rm -f $(BINDIR)/imgsizer $(BINDIR)/imgsizer $(MANDIR)/imgsizer.1 clean: - rm -f imgsizer.1 *~ - rm -f imgsizer-*-1.noarch.rpm imgsizer-*-1.noarch.rpm imgsizer-*.tar.gz - rm -f test-after.html + rm -f imgsizer.1 *~ imgsizer-*.tar.gz + rm -f test-after.html index.html imgsizer.html imgsizer.1: imgsizer.xml xmlto man imgsizer.xml -SOURCES = README COPYING Makefile imgsizer.spec \ - imgsizer imgsizer.xml \ - test-before.html test-converted.html test.png tnhd2.jpg +imgsizer.html: imgsizer.xml + xmlto html-nochunks imgsizer.xml + +# The original unshrunk crate logo is at +# http://clipart-library.com/image_gallery/22229.jpg +SOURCES = README COPYING NEWS control Makefile imgsizer imgsizer.xml crate.jpg \ + test-before.html test-converted.html test.png tnhd2.jpg crate.png imgsizer-$(VERS).tar.gz: $(SOURCES) imgsizer.1 mkdir imgsizer-$(VERS) @@ -31,12 +36,23 @@ rm -fr imgsizer-$(VERS) ls -l imgsizer-$(VERS).tar.gz +PYLINTOPTS = --rcfile=/dev/null --reports=n --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" --dummy-variables-rgx='^_' --disable=C0103,C0111,C0301,C0326,F0401,R0912,W0121,W0603,W0621,W0622,W0633 +pylint: + @pylint $(PYLINTOPTS) imgsizer + +version: + @echo $(VERS) + # Regression test is good if there is no output -test: - imgsizer <test-before.html >test-after.html - diff -c test-after.html test-converted.html +check: + @imgsizer <test-before.html >test-after.html + @diff -c test-after.html test-converted.html + @echo "No output (other than this) is good news" dist: imgsizer-$(VERS).tar.gz release: imgsizer-$(VERS).tar.gz imgsizer.html - shipper -f; rm -f CHANGES ANNOUNCE* *.1 *.html *.rpm *.lsm + shipper version=$(VERS) | sh -e -x + +refresh: imgsizer.html + shipper -N -w version=$(VERS) | sh -e -x diff -Nru imgsizer-2.7/NEWS imgsizer-2.10/NEWS --- imgsizer-2.7/NEWS 1970-01-01 02:00:00.000000000 +0200 +++ imgsizer-2.10/NEWS 2019-06-12 17:36:12.000000000 +0300 @@ -0,0 +1,55 @@ += imgsizer project news = + +2.10: 2019-06-12:: + Forward-ported to run under either current Python 2 or Python 3. + +2.9: 2015-04-05:: + pylint and test cleanup. + +2.8: 2010-10-20:: + Preferred style in HTML has changed, default to emitting lowercase tags. + Changed license to BSD. + +2.7: 2004-07-05:: + Added capability to use PIL if both file(1) and identify(1) fail. + Added BUGS section to manual page. + +2.6: 2003-12-29:: + Source RPMs no longer depend on --define myversion. + +2.5: 2003-11-15:: + Verify and merge Lucien Saviot's patch to produce XHTML from XHTML input. + Also his change to handle spurious lin e breaks produced by Dave Raggett's + tidy(1) utility. + +2.4: 2003-04-25:: + Documentation improvements. + +2.3: 2002-07-30:: + XML conversion of manual page. + +2.2: 2001-09-06:: + Documentation improvements. + +2.1: 2001-07-30:: + Build typo fix. + +2.0: 2001-07-11:: + RPM fix. + +1.9: 2001-03-09:: + Two bug fixes by Michael C. Toren <[email protected]>. + +1.8: 2000-08-31:: + Build tweak. + +1.7: 2000-08-19:: + Michael C. Toren <[email protected]> added -q and -l switches + and two minor bug fixes. + +1.6: 1999-06-11:: + Remove some prerequisites and improve documentation. + +Some older history is in the source header comment. + + diff -Nru imgsizer-2.7/README imgsizer-2.10/README --- imgsizer-2.7/README 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/README 2019-06-12 17:36:12.000000000 +0300 @@ -1,16 +1,9 @@ - imgsizer -- autogenerate WIDTH and HEIGHT for IMG tags += imgsizer -- autogenerate WIDTH and HEIGHT for IMG tags = This is a nifty little HTML authoring tool that will generate correct Netscape-style WIDTH and HEIGHT parameters for each of your IMG tags. This will enable the text parts of your page to load much faster. -Files in this directory: - - README -- this file - imgsizer -- the utility - imgsizer.xml -- manual page in XML-DocBook RefEntry format - Makefile -- installation and packaging productions - Put imgsizer on your execution path and the man page in a man source directory somewhere. `make install' will do the right thing on a Linux box. That's it. @@ -18,14 +11,7 @@ You will need either identify(1) from the ImageMagick tools or rdjpgcom(1) and a modern version of file(1) to make this work. If you are using Linux or any of the free BSDs these tools are probably -already on your system; otherwise, you should be able to get -identify(1) from ftp://ftp.x.org/contrib/applications/ImageMagick. - -Usual open-source terms -- copy, use, and redistribute as you like, -don't take my name off it, and clearly mark any modified versions. -Fixes and enhancements cheerfully accepted. Enjoy! - -- esr - http://www.catb.org/~esr +already on your system. diff -Nru imgsizer-2.7/test-before.html imgsizer-2.10/test-before.html --- imgsizer-2.7/test-before.html 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/test-before.html 2019-06-12 17:36:12.000000000 +0300 @@ -29,3 +29,4 @@ Try a JPEG <img src="tnhd2.jpg"> </body></html> +<!-- shipper: ignore this --> diff -Nru imgsizer-2.7/test-converted.html imgsizer-2.10/test-converted.html --- imgsizer-2.7/test-converted.html 2004-08-06 02:59:17.000000000 +0300 +++ imgsizer-2.10/test-converted.html 2019-06-12 17:36:12.000000000 +0300 @@ -29,3 +29,4 @@ Try a JPEG <img src="tnhd2.jpg" width="381" height="599"> </body></html> +<!-- shipper: ignore this -->
