Hello community, here is the log from the commit of package mwic for openSUSE:Factory checked in at 2020-04-07 10:31:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mwic (Old) and /work/SRC/openSUSE:Factory/.mwic.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mwic" Tue Apr 7 10:31:26 2020 rev:6 rq:791821 version:0.7.8 Changes: -------- --- /work/SRC/openSUSE:Factory/mwic/mwic.changes 2018-12-04 20:57:49.892619914 +0100 +++ /work/SRC/openSUSE:Factory/.mwic.new.3248/mwic.changes 2020-04-07 10:32:25.714585136 +0200 @@ -1,0 +2,14 @@ +Mon Mar 30 16:35:53 UTC 2020 - Sebastian Wagner <sebix+novell....@sebix.at> + +- update to version 0.7.8: + * Add new multi-word misspellings to the dictionary. + * Use the \e[90m sequence for dark gray. + * Improve the build system: + + Check Python version on install. + + Byte-compile Python code on install. + https://github.com/jwilk/mwic/issues/9 + + Don't require GNU install(1). + * Rephrase descriptions of --help and --version in help messages. + * Improve the test suite. + +------------------------------------------------------------------- Old: ---- mwic-0.7.7.tar.gz mwic-0.7.7.tar.gz.asc New: ---- mwic-0.7.8.tar.gz mwic-0.7.8.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mwic.spec ++++++ --- /var/tmp/diff_new_pack.mD1W4z/_old 2020-04-07 10:32:26.834586595 +0200 +++ /var/tmp/diff_new_pack.mD1W4z/_new 2020-04-07 10:32:26.834586595 +0200 @@ -1,7 +1,7 @@ # # spec file for package mwic # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,12 @@ %{!?license: %global license %doc} Name: mwic -Version: 0.7.7 +Version: 0.7.8 Release: 0 Summary: A spellchecker with grouping support License: MIT Group: Productivity/Office/Other -Url: http://jwilk.net/software/mwic +URL: http://jwilk.net/software/mwic Source: https://github.com/jwilk/mwic/releases/download/%{version}/mwic-%{version}.tar.gz Source1: https://github.com/jwilk/mwic/releases/download/%{version}/mwic-%{version}.tar.gz.asc Source2: %{name}.keyring ++++++ mwic-0.7.7.tar.gz -> mwic-0.7.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/.pylintrc new/mwic-0.7.8/.pylintrc --- old/mwic-0.7.7/.pylintrc 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/.pylintrc 2019-11-16 18:11:55.000000000 +0100 @@ -5,10 +5,12 @@ disable = bad-builtin, bad-continuation, + bad-option-value, fixme, inconsistent-return-statements, invalid-name, locally-disabled, + no-else-continue, no-self-use, redefined-variable-type, similarities, @@ -23,7 +25,7 @@ [REPORTS] reports = no score = no -msg-template = {C}: {path}:{line}: {symbol} [{obj}] {msg} +msg-template = {path}:{line}: {C}: {symbol} [{obj}] {msg} [FORMAT] max-line-length = 120 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/Makefile new/mwic-0.7.8/Makefile --- old/mwic-0.7.7/Makefile 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/Makefile 2019-11-16 18:11:55.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2012-2018 Jakub Wilk <jw...@jwilk.net> +# Copyright © 2012-2019 Jakub Wilk <jw...@jwilk.net> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the “Software”), to deal @@ -19,34 +19,42 @@ # SOFTWARE. PYTHON = python3 -INSTALL = $(if $(shell command -v ginstall;),ginstall,install) PREFIX = /usr/local DESTDIR = -exe = mwic - bindir = $(PREFIX)/bin -basedir = $(PREFIX)/share/$(exe) +basedir = $(PREFIX)/share/mwic mandir = $(PREFIX)/share/man .PHONY: all all: ; +python_exe = $(shell $(PYTHON) -c 'import sys; print(sys.executable)') + .PHONY: install -install: - # binary: - $(INSTALL) -d -m755 $(DESTDIR)$(bindir) - sed -e "s#^basedir = .*#basedir = '$(basedir)/'#" $(exe) > $(DESTDIR)$(bindir)/$(exe) - chmod 0755 $(DESTDIR)$(bindir)/$(exe) +install: mwic + $(PYTHON) - < lib/__init__.py # Python version check + # executable: + install -d $(DESTDIR)$(bindir) + sed \ + -e "1 s@^#!.*@#!$(python_exe)@" \ + -e "s#^basedir = .*#basedir = '$(basedir)/'#" \ + $(<) > $(<).tmp + install $(<).tmp $(DESTDIR)$(bindir)/$(<) + rm $(<).tmp # library + data: - ( find lib dict -type f ! -name '*.py[co]' ) \ - | xargs -t -I {} $(INSTALL) -p -D -m644 {} $(DESTDIR)$(basedir)/{} -ifeq "$(wildcard doc/$(exe).1)" "" + install -d $(DESTDIR)$(basedir)/dict + install -p -m644 dict/* $(DESTDIR)$(basedir)/dict/ + install -d $(DESTDIR)$(basedir)/lib + install -p -m644 lib/*.py $(DESTDIR)$(basedir)/lib/ + umask 022 && $(PYTHON) -m compileall -q -d $(basedir)/lib $(DESTDIR)$(basedir)/lib +ifeq "$(wildcard doc/*.1)" "" # run "$(MAKE) -C doc" to build the manpage else # manual page: - $(INSTALL) -p -D -m644 doc/$(exe).1 $(DESTDIR)$(mandir)/man1/$(exe).1 + install -d $(DESTDIR)$(mandir)/man1 + install -p -m644 doc/$(<).1 $(DESTDIR)$(mandir)/man1/ endif .PHONY: test @@ -58,6 +66,7 @@ find . -type f -name '*.py[co]' -delete find . -type d -name '__pycache__' -delete rm -f .coverage + rm -f *.tmp .error = GNU make is required diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/dict/en new/mwic-0.7.8/dict/en --- old/mwic-0.7.7/dict/en 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/dict/en 2019-11-16 18:11:55.000000000 +0100 @@ -149,6 +149,9 @@ # it's own → its own it’s own +# it's goal → its goal +it’s goal + # its ART → it's ART its $ART @@ -186,6 +189,12 @@ # lot's of → lots of lot’s of +# pubic key → public keys +pubic keys? + +# regarding to X → regarding X +regarding to + # an → a an Unicode an unary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/doc/LICENSE new/mwic-0.7.8/doc/LICENSE --- old/mwic-0.7.7/doc/LICENSE 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/doc/LICENSE 2019-11-16 18:11:55.000000000 +0100 @@ -1,4 +1,4 @@ -Copyright © 2012-2018 Jakub Wilk <jw...@jwilk.net> +Copyright © 2012-2019 Jakub Wilk <jw...@jwilk.net> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/doc/changelog new/mwic-0.7.8/doc/changelog --- old/mwic-0.7.7/doc/changelog 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/doc/changelog 2019-11-16 18:11:55.000000000 +0100 @@ -1,3 +1,17 @@ +mwic (0.7.8) unstable; urgency=low + + * Add new multi-word misspellings to the dictionary. + * Use the \e[90m sequence for dark gray. + * Improve the build system: + + Check Python version on install. + + Byte-compile Python code on install. + https://github.com/jwilk/mwic/issues/9 + + Don't require GNU install(1). + * Rephrase descriptions of --help and --version in help messages. + * Improve the test suite. + + -- Jakub Wilk <jw...@jwilk.net> Sat, 16 Nov 2019 18:11:49 +0100 + mwic (0.7.7) unstable; urgency=low * Don't die with exception when a file cannot be opened. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/doc/manpage.rst new/mwic-0.7.8/doc/manpage.rst --- old/mwic-0.7.7/doc/manpage.rst 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/doc/manpage.rst 2019-11-16 18:11:55.000000000 +0100 @@ -7,8 +7,8 @@ --------------------------- :manual section: 1 -:version: mwic 0.7.7 -:date: 2018-10-02 +:version: mwic 0.7.8 +:date: 2018-11-14 Synopsis -------- @@ -76,10 +76,10 @@ Suggest up to *n* corrections. -h, --help - Show the help message and exit. + Show help message and exit. --version - Show the program's version information and exit. + Show version information and exit. Environment ----------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/doc/mwic.1 new/mwic-0.7.8/doc/mwic.1 --- old/mwic-0.7.7/doc/mwic.1 2018-11-12 17:42:38.000000000 +0100 +++ new/mwic-0.7.8/doc/mwic.1 2019-11-16 18:11:58.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH MWIC 1 "2018-10-02" "mwic 0.7.7" "" +.TH MWIC 1 "2018-11-14" "mwic 0.7.8" "" .SH NAME mwic \- Misspelled Words In Context . @@ -93,10 +93,10 @@ Suggest up to \fIn\fP corrections. .TP .B \-h\fP,\fB \-\-help -Show the help message and exit. +Show help message and exit. .TP .B \-\-version -Show the program's version information and exit. +Show version information and exit. .UNINDENT .SH ENVIRONMENT .INDENT 0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/doc/screenshot.svg new/mwic-0.7.8/doc/screenshot.svg --- old/mwic-0.7.7/doc/screenshot.svg 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/doc/screenshot.svg 2019-11-16 18:11:55.000000000 +0100 @@ -1,30 +1,30 @@ -<svg xmlns="http://www.w3.org/2000/svg"; baseProfile="full" height="76.2ex" version="1.1" viewBox="0 0 804 762" width="80.4ex"> +<svg xmlns="http://www.w3.org/2000/svg"; baseProfile="full" version="1.1" viewBox="0 0 804 762" width="80.4ex" height="76.2ex"> <g font-family="monospace" font-size="16"> -<rect height="764" width="804"></rect><rect height="20" width="10" x="2" y="2"></rect><g fill="#fff" font-weight="bold"><text x="2" y="17">$</text> </g><rect height="20" width="740" x="12" y="2"></rect><g fill="#e4e4e4"><text x="22" y="17">m</text><text x="32" y="17">w</text><text x="42" y="17">i</text><text x="52" y="17">c</text> <text x="72" y="17">-</text><text x="82" y="17">-</text><text x="92" y="17">b</text><text x="102" y="17">l</text><text x="112" y="17">a</text><text x="122" y="17">c</text><text x="132" y="17">k</text><text x="142" y="17">l</text><text x="152" y="17">i</text><text x="162" y="17">s</text><text x="172" y="17">t</text> <text x="192" y="17">/</text><text x="202" y="17">u</text><text x="212" y="17">s</text><text x="222" y="17">r</text><text x="232" y="17">/</text><text x="242" y="17">s</text><text x="252" y="17">h</text><text x="262" y="17">a</text><text x="272" y="17">r</text><text x="282" y="17">e</text><text x="292" y="17">/</text><text x="302" y="17">l</text><text x="312" y="17">i</text><text x="322" y="17">n</text><text x="332" y="17">t</text><text x="342" y="17">i</text><text x="352" y="17">a</text><text x="362" y="17">n</text><text x="372" y="17">/</text><text x="382" y="17">d</text><text x="392" y="17">a</text><text x="402" y="17">t</text><text x="412" y="17">a</text><text x="422" y="17">/</text><text x="432" y="17">s</text><text x="442" y="17">p</text><text x="452" y="17">e</text><text x="462" y="17">l</text><text x="472" y="17">l</text><text x="482" y="17">i</text><text x="492" y="17">n</text><text x="502" y="17">g</text><text x="512" y="17">/</text><text x="522" y="17">c</text><text x="532" y="17">o</text><text x="542" y="17">r</text><text x="552" y="17">r</text><text x="562" y="17">e</text><text x="572" y="17">c</text><text x="582" y="17">t</text><text x="592" y="17">i</text><text x="602" y="17">o</text><text x="612" y="17">n</text><text x="622" y="17">s</text> <text x="642" y="17">r</text><text x="652" y="17">f</text><text x="662" y="17">c</text><text x="672" y="17">1</text><text x="682" y="17">9</text><text x="692" y="17">2</text><text x="702" y="17">7</text><text x="712" y="17">.</text><text x="722" y="17">t</text><text x="732" y="17">x</text><text x="742" y="17">t</text></g> -<rect height="20" width="50" x="752" y="2"></rect><rect height="20" width="130" x="2" y="22"></rect><g fill="#e4e4e4"><text x="2" y="37">h</text><text x="12" y="37">e</text><text x="22" y="37">i</text><text x="32" y="37">r</text><text x="42" y="37">a</text><text x="52" y="37">r</text><text x="62" y="37">c</text><text x="72" y="37">h</text><text x="82" y="37">i</text><text x="92" y="37">c</text><text x="102" y="37">a</text><text x="112" y="37">l</text><text x="122" y="37">:</text></g> -<rect height="20" width="670" x="132" y="22"></rect><rect height="20" width="10" x="2" y="42"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="57">|</text> </g><rect height="20" width="310" x="12" y="42"></rect><g fill="#e4e4e4"><text x="22" y="57">…</text><text x="32" y="57">g</text> <text x="52" y="57">p</text><text x="62" y="57">a</text><text x="72" y="57">p</text><text x="82" y="57">e</text><text x="92" y="57">r</text> <text x="112" y="57">c</text><text x="122" y="57">l</text><text x="132" y="57">i</text><text x="142" y="57">p</text><text x="152" y="57">s</text> <text x="172" y="57">v</text><text x="182" y="57">s</text> <text x="202" y="57">s</text><text x="212" y="57">m</text><text x="222" y="57">a</text><text x="232" y="57">l</text><text x="242" y="57">l</text> <text x="262" y="57">o</text><text x="272" y="57">n</text><text x="282" y="57">e</text><text x="292" y="57">s</text><text x="302" y="57">;</text> </g><rect fill="#c00" height="20" width="120" x="322" y="42"></rect><g><text x="322" y="57">h</text><text x="332" y="57">e</text><text x="342" y="57">i</text><text x="352" y="57">r</text><text x="362" y="57">a</text><text x="372" y="57">r</text><text x="382" y="57">c</text><text x="392" y="57">h</text><text x="402" y="57">i</text><text x="412" y="57">c</text><text x="422" y="57">a</text><text x="432" y="57">l</text> </g><rect height="20" width="90" x="442" y="42"></rect><g fill="#e4e4e4"><text x="452" y="57">a</text><text x="462" y="57">s</text><text x="472" y="57">s</text><text x="482" y="57">e</text><text x="492" y="57">m</text><text x="502" y="57">b</text><text x="512" y="57">l</text><text x="522" y="57">y</text></g> -<rect height="20" width="270" x="532" y="42"></rect><rect height="20" width="800" x="2" y="62"></rect><rect height="20" width="80" x="2" y="82"></rect><g fill="#e4e4e4"><text x="2" y="97">r</text><text x="12" y="97">e</text><text x="22" y="97">y</text><text x="32" y="97">c</text><text x="42" y="97">l</text><text x="52" y="97">e</text><text x="62" y="97">d</text><text x="72" y="97">:</text></g> -<rect height="20" width="720" x="82" y="82"></rect><rect height="20" width="10" x="2" y="102"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="117">|</text> </g><rect height="20" width="210" x="12" y="102"></rect><g fill="#e4e4e4"><text x="22" y="117">1</text><text x="32" y="117">)</text> <text x="52" y="117">s</text><text x="62" y="117">t</text><text x="72" y="117">a</text><text x="82" y="117">p</text><text x="92" y="117">l</text><text x="102" y="117">e</text><text x="112" y="117">s</text> <text x="132" y="117">c</text><text x="142" y="117">o</text><text x="152" y="117">u</text><text x="162" y="117">l</text><text x="172" y="117">d</text> <text x="192" y="117">b</text><text x="202" y="117">e</text> </g><rect fill="#cc8500" height="20" width="70" x="222" y="102"></rect><g><text x="222" y="117">r</text><text x="232" y="117">e</text><text x="242" y="117">y</text><text x="252" y="117">c</text><text x="262" y="117">l</text><text x="272" y="117">e</text><text x="282" y="117">d</text> </g><rect height="20" width="190" x="292" y="102"></rect><g fill="#e4e4e4"><text x="302" y="117">f</text><text x="312" y="117">o</text><text x="322" y="117">r</text> <text x="342" y="117">a</text> <text x="362" y="117">s</text><text x="372" y="117">m</text><text x="382" y="117">a</text><text x="392" y="117">l</text><text x="402" y="117">l</text> <text x="422" y="117">c</text><text x="432" y="117">r</text><text x="442" y="117">e</text><text x="452" y="117">d</text><text x="462" y="117">i</text><text x="472" y="117">t</text></g> -<rect height="20" width="320" x="482" y="102"></rect><rect height="20" width="800" x="2" y="122"></rect><rect height="20" width="70" x="2" y="142"></rect><g fill="#e4e4e4"><text x="2" y="157">f</text><text x="12" y="157">l</text><text x="22" y="157">i</text><text x="32" y="157">n</text><text x="42" y="157">e</text><text x="52" y="157">s</text><text x="62" y="157">:</text></g> -<rect height="20" width="730" x="72" y="142"></rect><rect height="20" width="10" x="2" y="162"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="177">|</text> </g><rect height="20" width="310" x="12" y="162"></rect><g fill="#e4e4e4"><text x="22" y="177">…</text><text x="32" y="177">y</text> <text x="52" y="177">s</text><text x="62" y="177">h</text><text x="72" y="177">o</text><text x="82" y="177">u</text><text x="92" y="177">l</text><text x="102" y="177">d</text> <text x="122" y="177">n</text><text x="132" y="177">o</text><text x="142" y="177">t</text> <text x="162" y="177">b</text><text x="172" y="177">e</text> <text x="192" y="177">u</text><text x="202" y="177">s</text><text x="212" y="177">e</text><text x="222" y="177">d</text> <text x="242" y="177">o</text><text x="252" y="177">n</text> <text x="272" y="177">d</text><text x="282" y="177">a</text><text x="292" y="177">t</text><text x="302" y="177">a</text> </g><rect fill="#cc8500" height="20" width="60" x="322" y="162"></rect><g><text x="322" y="177">f</text><text x="332" y="177">l</text><text x="342" y="177">i</text><text x="352" y="177">n</text><text x="362" y="177">e</text><text x="372" y="177">s</text> </g><rect height="20" width="220" x="382" y="162"></rect><g fill="#e4e4e4"><text x="392" y="177">w</text><text x="402" y="177">h</text><text x="412" y="177">i</text><text x="422" y="177">c</text><text x="432" y="177">h</text> <text x="452" y="177">m</text><text x="462" y="177">i</text><text x="472" y="177">g</text><text x="482" y="177">h</text><text x="492" y="177">t</text> <text x="512" y="177">e</text><text x="522" y="177">n</text><text x="532" y="177">d</text> <text x="552" y="177">u</text><text x="562" y="177">p</text> <text x="582" y="177">i</text><text x="592" y="177">n</text></g> -<rect height="20" width="200" x="602" y="162"></rect><rect height="20" width="800" x="2" y="182"></rect><rect height="20" width="90" x="2" y="202"></rect><g fill="#e4e4e4"><text x="2" y="217">r</text><text x="12" y="217">e</text><text x="22" y="217">c</text><text x="32" y="217">y</text><text x="42" y="217">c</text><text x="52" y="217">l</text><text x="62" y="217">e</text><text x="72" y="217">r</text><text x="82" y="217">:</text></g> -<rect height="20" width="710" x="92" y="202"></rect><rect height="20" width="10" x="2" y="222"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="237">|</text> </g><rect height="20" width="310" x="12" y="222"></rect><g fill="#e4e4e4"><text x="22" y="237">…</text><text x="32" y="237">i</text><text x="42" y="237">l</text><text x="52" y="237">e</text> <text x="72" y="237">o</text><text x="82" y="237">r</text> <text x="102" y="237">f</text><text x="112" y="237">o</text><text x="122" y="237">l</text><text x="132" y="237">d</text><text x="142" y="237">e</text><text x="152" y="237">r</text> <text x="172" y="237">i</text><text x="182" y="237">s</text> <text x="202" y="237">d</text><text x="212" y="237">e</text><text x="222" y="237">l</text><text x="232" y="237">e</text><text x="242" y="237">t</text><text x="252" y="237">e</text><text x="262" y="237">d</text><text x="272" y="237">,</text> <text x="292" y="237">a</text> <text x="312" y="237">"</text></g><rect fill="#cc8500" height="20" width="80" x="322" y="222"></rect><g><text x="322" y="237">r</text><text x="332" y="237">e</text><text x="342" y="237">c</text><text x="352" y="237">y</text><text x="362" y="237">c</text><text x="372" y="237">l</text><text x="382" y="237">e</text><text x="392" y="237">r</text></g><rect height="20" width="150" x="402" y="222"></rect><g fill="#e4e4e4"><text x="402" y="237">"</text> <text x="422" y="237">p</text><text x="432" y="237">r</text><text x="442" y="237">o</text><text x="452" y="237">g</text><text x="462" y="237">r</text><text x="472" y="237">a</text><text x="482" y="237">m</text> <text x="502" y="237">c</text><text x="512" y="237">o</text><text x="522" y="237">u</text><text x="532" y="237">l</text><text x="542" y="237">d</text></g> -<rect height="20" width="250" x="552" y="222"></rect><rect height="20" width="800" x="2" y="242"></rect><rect height="20" width="40" x="2" y="262"></rect><g fill="#e4e4e4"><text x="2" y="277">s</text><text x="12" y="277">r</text><text x="22" y="277">c</text><text x="32" y="277">:</text></g> -<rect height="20" width="760" x="42" y="262"></rect><rect height="20" width="10" x="2" y="282"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="297">|</text> </g><rect height="20" width="50" x="12" y="282"></rect><g fill="#e4e4e4"><text x="22" y="297">3</text><text x="32" y="297">)</text> <text x="52" y="297">"</text></g><rect fill="#cc8500" height="20" width="30" x="62" y="282"></rect><g><text x="62" y="297">s</text><text x="72" y="297">r</text><text x="82" y="297">c</text></g><rect height="20" width="300" x="92" y="282"></rect><g fill="#e4e4e4"><text x="92" y="297">=</text><text x="102" y="297">"</text> <text x="122" y="297">w</text><text x="132" y="297">o</text><text x="142" y="297">u</text><text x="152" y="297">l</text><text x="162" y="297">d</text> <text x="182" y="297">a</text><text x="192" y="297">l</text><text x="202" y="297">l</text><text x="212" y="297">o</text><text x="222" y="297">w</text> <text x="242" y="297">t</text><text x="252" y="297">h</text><text x="262" y="297">e</text> <text x="282" y="297">s</text><text x="292" y="297">p</text><text x="302" y="297">e</text><text x="312" y="297">c</text><text x="322" y="297">i</text><text x="332" y="297">f</text><text x="342" y="297">i</text><text x="352" y="297">c</text><text x="362" y="297">a</text><text x="372" y="297">t</text><text x="382" y="297">…</text></g> -<rect height="20" width="410" x="392" y="282"></rect><rect height="20" width="800" x="2" y="302"></rect><rect height="20" width="40" x="2" y="322"></rect><g fill="#e4e4e4"><text x="2" y="337">I</text><text x="12" y="337">S</text><text x="22" y="337">I</text><text x="32" y="337">:</text></g> -<rect height="20" width="760" x="42" y="322"></rect><rect height="20" width="10" x="2" y="342"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="357">|</text> </g><rect height="20" width="310" x="12" y="342"></rect><g fill="#e4e4e4"><text x="22" y="357">…</text> </g><rect fill="#cc8500" height="20" width="30" x="322" y="342"></rect><g><text x="322" y="357">I</text><text x="332" y="357">S</text><text x="342" y="357">I</text></g> -<rect height="20" width="450" x="352" y="342"></rect><rect height="20" width="800" x="2" y="362"></rect><rect height="20" width="40" x="2" y="382"></rect><g fill="#e4e4e4"><text x="2" y="397">U</text><text x="12" y="397">S</text><text x="22" y="397">C</text><text x="32" y="397">:</text></g> -<rect height="20" width="760" x="42" y="382"></rect><rect height="20" width="10" x="2" y="402"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="417">|</text> </g><rect height="20" width="10" x="12" y="402"></rect><rect fill="#cc8500" height="20" width="30" x="22" y="402"></rect><g><text x="22" y="417">U</text><text x="32" y="417">S</text><text x="42" y="417">C</text></g><rect height="20" width="300" x="52" y="402"></rect><g fill="#e4e4e4"><text x="52" y="417">/</text><text x="62" y="417">I</text><text x="72" y="417">n</text><text x="82" y="417">f</text><text x="92" y="417">o</text><text x="102" y="417">r</text><text x="112" y="417">m</text><text x="122" y="417">a</text><text x="132" y="417">t</text><text x="142" y="417">i</text><text x="152" y="417">o</text><text x="162" y="417">n</text> <text x="182" y="417">S</text><text x="192" y="417">c</text><text x="202" y="417">i</text><text x="212" y="417">e</text><text x="222" y="417">n</text><text x="232" y="417">c</text><text x="242" y="417">e</text><text x="252" y="417">s</text> <text x="272" y="417">I</text><text x="282" y="417">n</text><text x="292" y="417">s</text><text x="302" y="417">t</text><text x="312" y="417">i</text><text x="322" y="417">t</text><text x="332" y="417">u</text><text x="342" y="417">…</text></g> -<rect height="20" width="450" x="352" y="402"></rect><rect height="20" width="800" x="2" y="422"></rect><rect height="20" width="60" x="2" y="442"></rect><g fill="#e4e4e4"><text x="2" y="457">b</text><text x="12" y="457">e</text><text x="22" y="457">n</text><text x="32" y="457">t</text><text x="42" y="457">o</text><text x="52" y="457">:</text></g> -<rect height="20" width="740" x="62" y="442"></rect><rect height="20" width="10" x="2" y="462"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="477">|</text> </g><rect height="20" width="310" x="12" y="462"></rect><g fill="#e4e4e4"><text x="22" y="477">…</text><text x="32" y="477">f</text> <text x="52" y="477">5</text><text x="62" y="477">0</text><text x="72" y="477">0</text><text x="82" y="477">0</text><text x="92" y="477">.</text> <text x="122" y="477">R</text><text x="132" y="477">e</text><text x="142" y="477">f</text><text x="152" y="477">e</text><text x="162" y="477">r</text><text x="172" y="477">e</text><text x="182" y="477">n</text><text x="192" y="477">c</text><text x="202" y="477">e</text><text x="212" y="477">:</text> <text x="232" y="477">A</text><text x="242" y="477">p</text><text x="252" y="477">p</text><text x="262" y="477">l</text><text x="272" y="477">e</text><text x="282" y="477">'</text><text x="292" y="477">s</text> <text x="312" y="477">"</text></g><rect fill="#cc8500" height="20" width="50" x="322" y="462"></rect><g><text x="322" y="477">b</text><text x="332" y="477">e</text><text x="342" y="477">n</text><text x="352" y="477">t</text><text x="362" y="477">o</text></g><rect height="20" width="10" x="372" y="462"></rect><g fill="#e4e4e4"><text x="372" y="477">"</text></g> -<rect height="20" width="420" x="382" y="462"></rect><rect height="20" width="800" x="2" y="482"></rect><rect height="20" width="100" x="2" y="502"></rect><g fill="#e4e4e4"><text x="2" y="517">m</text><text x="12" y="517">u</text><text x="22" y="517">l</text><text x="32" y="517">t</text><text x="42" y="517">i</text><text x="52" y="517">p</text><text x="62" y="517">a</text><text x="72" y="517">g</text><text x="82" y="517">e</text><text x="92" y="517">:</text></g> -<rect height="20" width="700" x="102" y="502"></rect><rect height="20" width="10" x="2" y="522"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="537">|</text> </g><rect height="20" width="310" x="12" y="522"></rect><g fill="#e4e4e4"><text x="22" y="537">…</text><text x="32" y="537">r</text> <text x="52" y="537">c</text><text x="62" y="537">l</text><text x="72" y="537">i</text><text x="82" y="537">p</text> <text x="102" y="537">t</text><text x="112" y="537">o</text> <text x="132" y="537">a</text> <text x="152" y="537">s</text><text x="162" y="537">i</text><text x="172" y="537">n</text><text x="182" y="537">g</text><text x="192" y="537">l</text><text x="202" y="537">e</text> <text x="222" y="537">p</text><text x="232" y="537">a</text><text x="242" y="537">g</text><text x="252" y="537">e</text> <text x="272" y="537">o</text><text x="282" y="537">f</text> <text x="302" y="537">a</text> </g><rect fill="#cc8500" height="20" width="90" x="322" y="522"></rect><g><text x="322" y="537">m</text><text x="332" y="537">u</text><text x="342" y="537">l</text><text x="352" y="537">t</text><text x="362" y="537">i</text><text x="372" y="537">p</text><text x="382" y="537">a</text><text x="392" y="537">g</text><text x="402" y="537">e</text> </g><rect height="20" width="120" x="412" y="522"></rect><g fill="#e4e4e4"><text x="422" y="537">d</text><text x="432" y="537">o</text><text x="442" y="537">c</text><text x="452" y="537">u</text><text x="462" y="537">m</text><text x="472" y="537">e</text><text x="482" y="537">n</text><text x="492" y="537">t</text> <text x="512" y="537">o</text><text x="522" y="537">r</text></g> -<rect height="20" width="270" x="532" y="522"></rect><rect height="20" width="800" x="2" y="542"></rect><rect height="20" width="90" x="2" y="562"></rect><g fill="#e4e4e4"><text x="2" y="577">R</text><text x="12" y="577">e</text><text x="22" y="577">y</text><text x="32" y="577">,</text> <text x="52" y="577">d</text><text x="62" y="577">e</text><text x="72" y="577">l</text><text x="82" y="577">:</text></g> -<rect height="20" width="710" x="92" y="562"></rect><rect height="20" width="10" x="2" y="582"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="597">|</text> </g><rect height="20" width="80" x="12" y="582"></rect><g fill="#e4e4e4"><text x="22" y="597">M</text><text x="32" y="597">a</text><text x="42" y="597">r</text><text x="52" y="597">i</text><text x="62" y="597">n</text><text x="72" y="597">a</text> </g><rect fill="#cc8500" height="20" width="30" x="92" y="582"></rect><g><text x="92" y="597">d</text><text x="102" y="597">e</text><text x="112" y="597">l</text> </g><rect height="20" width="10" x="122" y="582"></rect><rect fill="#cc8500" height="20" width="30" x="132" y="582"></rect><g><text x="132" y="597">R</text><text x="142" y="597">e</text><text x="152" y="597">y</text></g><rect height="20" width="100" x="162" y="582"></rect><g fill="#e4e4e4"><text x="162" y="597">,</text> <text x="182" y="597">C</text><text x="192" y="597">A</text> <text x="212" y="597">9</text><text x="222" y="597">0</text><text x="232" y="597">2</text><text x="242" y="597">9</text><text x="252" y="597">2</text></g> -<rect height="20" width="540" x="262" y="582"></rect><rect height="20" width="800" x="2" y="602"></rect><rect height="20" width="160" x="2" y="622"></rect><g fill="#e4e4e4"><text x="2" y="637">E</text><text x="12" y="637">M</text><text x="22" y="637">a</text><text x="32" y="637">i</text><text x="42" y="637">l</text><text x="52" y="637">,</text> <text x="72" y="637">e</text><text x="82" y="637">d</text><text x="92" y="637">u</text><text x="102" y="637">,</text> <text x="122" y="637">i</text><text x="132" y="637">s</text><text x="142" y="637">i</text><text x="152" y="637">:</text></g> -<rect height="20" width="640" x="162" y="622"></rect><rect height="20" width="10" x="2" y="642"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="657">|</text> </g><rect height="20" width="10" x="12" y="642"></rect><rect fill="#cc8500" height="20" width="50" x="22" y="642"></rect><g><text x="22" y="657">E</text><text x="32" y="657">M</text><text x="42" y="657">a</text><text x="52" y="657">i</text><text x="62" y="657">l</text></g><rect height="20" width="90" x="72" y="642"></rect><g fill="#e4e4e4"><text x="72" y="657">:</text> <text x="92" y="657">r</text><text x="102" y="657">o</text><text x="112" y="657">g</text><text x="122" y="657">e</text><text x="132" y="657">r</text><text x="142" y="657">s</text><text x="152" y="657">@</text></g><rect fill="#cc8500" height="20" width="30" x="162" y="642"></rect><g><text x="162" y="657">i</text><text x="172" y="657">s</text><text x="182" y="657">i</text></g><rect height="20" width="10" x="192" y="642"></rect><g fill="#e4e4e4"><text x="192" y="657">.</text></g><rect fill="#cc8500" height="20" width="30" x="202" y="642"></rect><g><text x="202" y="657">e</text><text x="212" y="657">d</text><text x="222" y="657">u</text></g> -<rect height="20" width="570" x="232" y="642"></rect><rect height="20" width="800" x="2" y="662"></rect><rect height="20" width="100" x="2" y="682"></rect><g fill="#e4e4e4"><text x="2" y="697">e</text><text x="12" y="697">l</text><text x="22" y="697">e</text><text x="32" y="697">c</text><text x="42" y="697">t</text><text x="52" y="697">o</text><text x="62" y="697">n</text><text x="72" y="697">i</text><text x="82" y="697">c</text><text x="92" y="697">:</text></g> -<rect height="20" width="700" x="102" y="682"></rect><rect height="20" width="10" x="2" y="702"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="717">|</text> </g><rect height="20" width="150" x="12" y="702"></rect><g fill="#e4e4e4"><text x="22" y="717">d</text><text x="32" y="717">r</text><text x="42" y="717">a</text><text x="52" y="717">w</text><text x="62" y="717">e</text><text x="72" y="717">r</text> <text x="92" y="717">o</text><text x="102" y="717">f</text> <text x="122" y="717">t</text><text x="132" y="717">h</text><text x="142" y="717">e</text> </g><rect fill="#cc8500" height="20" width="90" x="162" y="702"></rect><g><text x="162" y="717">e</text><text x="172" y="717">l</text><text x="182" y="717">e</text><text x="192" y="717">c</text><text x="202" y="717">t</text><text x="212" y="717">o</text><text x="222" y="717">n</text><text x="232" y="717">i</text><text x="242" y="717">c</text> </g><rect height="20" width="170" x="252" y="702"></rect><g fill="#e4e4e4"><text x="262" y="717">d</text><text x="272" y="717">e</text><text x="282" y="717">s</text><text x="292" y="717">k</text> <text x="312" y="717">o</text><text x="322" y="717">n</text> <text x="342" y="717">h</text><text x="352" y="717">o</text><text x="362" y="717">m</text><text x="372" y="717">e</text> <text x="392" y="717">P</text><text x="402" y="717">C</text><text x="412" y="717">s</text></g> -<rect height="20" width="380" x="422" y="702"></rect><rect height="20" width="10" x="2" y="722"></rect><g fill="#4d4d4d" font-weight="bold"><text x="2" y="737">|</text> </g><rect height="20" width="150" x="12" y="722"></rect><g fill="#e4e4e4"><text x="132" y="737">3</text><text x="142" y="737">)</text> </g><rect fill="#cc8500" height="20" width="90" x="162" y="722"></rect><g><text x="162" y="737">e</text><text x="172" y="737">l</text><text x="182" y="737">e</text><text x="192" y="737">c</text><text x="202" y="737">t</text><text x="212" y="737">o</text><text x="222" y="737">n</text><text x="232" y="737">i</text><text x="242" y="737">c</text> </g><rect height="20" width="300" x="252" y="722"></rect><g fill="#e4e4e4"><text x="262" y="737">s</text><text x="272" y="737">t</text><text x="282" y="737">a</text><text x="292" y="737">p</text><text x="302" y="737">l</text><text x="312" y="737">e</text><text x="322" y="737">s</text> <text x="342" y="737">s</text><text x="352" y="737">h</text><text x="362" y="737">o</text><text x="372" y="737">u</text><text x="382" y="737">l</text><text x="392" y="737">d</text> <text x="412" y="737">h</text><text x="422" y="737">a</text><text x="432" y="737">v</text><text x="442" y="737">e</text> <text x="462" y="737">a</text> <text x="482" y="737">s</text><text x="492" y="737">t</text><text x="502" y="737">a</text><text x="512" y="737">n</text><text x="522" y="737">d</text><text x="532" y="737">a</text><text x="542" y="737">…</text></g> +<rect width="804" height="764"></rect><rect width="10" height="20" x="2" y="2"></rect><g fill="#fff" font-weight="bold"><text x="2" y="17">$</text> </g><rect width="740" height="20" x="12" y="2"></rect><g fill="#eee"><text x="22" y="17">m</text><text x="32" y="17">w</text><text x="42" y="17">i</text><text x="52" y="17">c</text> <text x="72" y="17">-</text><text x="82" y="17">-</text><text x="92" y="17">b</text><text x="102" y="17">l</text><text x="112" y="17">a</text><text x="122" y="17">c</text><text x="132" y="17">k</text><text x="142" y="17">l</text><text x="152" y="17">i</text><text x="162" y="17">s</text><text x="172" y="17">t</text> <text x="192" y="17">/</text><text x="202" y="17">u</text><text x="212" y="17">s</text><text x="222" y="17">r</text><text x="232" y="17">/</text><text x="242" y="17">s</text><text x="252" y="17">h</text><text x="262" y="17">a</text><text x="272" y="17">r</text><text x="282" y="17">e</text><text x="292" y="17">/</text><text x="302" y="17">l</text><text x="312" y="17">i</text><text x="322" y="17">n</text><text x="332" y="17">t</text><text x="342" y="17">i</text><text x="352" y="17">a</text><text x="362" y="17">n</text><text x="372" y="17">/</text><text x="382" y="17">d</text><text x="392" y="17">a</text><text x="402" y="17">t</text><text x="412" y="17">a</text><text x="422" y="17">/</text><text x="432" y="17">s</text><text x="442" y="17">p</text><text x="452" y="17">e</text><text x="462" y="17">l</text><text x="472" y="17">l</text><text x="482" y="17">i</text><text x="492" y="17">n</text><text x="502" y="17">g</text><text x="512" y="17">/</text><text x="522" y="17">c</text><text x="532" y="17">o</text><text x="542" y="17">r</text><text x="552" y="17">r</text><text x="562" y="17">e</text><text x="572" y="17">c</text><text x="582" y="17">t</text><text x="592" y="17">i</text><text x="602" y="17">o</text><text x="612" y="17">n</text><text x="622" y="17">s</text> <text x="642" y="17">r</text><text x="652" y="17">f</text><text x="662" y="17">c</text><text x="672" y="17">1</text><text x="682" y="17">9</text><text x="692" y="17">2</text><text x="702" y="17">7</text><text x="712" y="17">.</text><text x="722" y="17">t</text><text x="732" y="17">x</text><text x="742" y="17">t</text></g> +<rect width="50" height="20" x="752" y="2"></rect><rect width="130" height="20" x="2" y="22"></rect><g fill="#eee"><text x="2" y="37">h</text><text x="12" y="37">e</text><text x="22" y="37">i</text><text x="32" y="37">r</text><text x="42" y="37">a</text><text x="52" y="37">r</text><text x="62" y="37">c</text><text x="72" y="37">h</text><text x="82" y="37">i</text><text x="92" y="37">c</text><text x="102" y="37">a</text><text x="112" y="37">l</text><text x="122" y="37">:</text></g> +<rect width="670" height="20" x="132" y="22"></rect><rect width="10" height="20" x="2" y="42"></rect><g fill="#444" font-weight="bold"><text x="2" y="57">|</text> </g><rect width="310" height="20" x="12" y="42"></rect><g fill="#eee"><text x="22" y="57">…</text><text x="32" y="57">g</text> <text x="52" y="57">p</text><text x="62" y="57">a</text><text x="72" y="57">p</text><text x="82" y="57">e</text><text x="92" y="57">r</text> <text x="112" y="57">c</text><text x="122" y="57">l</text><text x="132" y="57">i</text><text x="142" y="57">p</text><text x="152" y="57">s</text> <text x="172" y="57">v</text><text x="182" y="57">s</text> <text x="202" y="57">s</text><text x="212" y="57">m</text><text x="222" y="57">a</text><text x="232" y="57">l</text><text x="242" y="57">l</text> <text x="262" y="57">o</text><text x="272" y="57">n</text><text x="282" y="57">e</text><text x="292" y="57">s</text><text x="302" y="57">;</text> </g><rect fill="#c00" width="120" height="20" x="322" y="42"></rect><g><text x="322" y="57">h</text><text x="332" y="57">e</text><text x="342" y="57">i</text><text x="352" y="57">r</text><text x="362" y="57">a</text><text x="372" y="57">r</text><text x="382" y="57">c</text><text x="392" y="57">h</text><text x="402" y="57">i</text><text x="412" y="57">c</text><text x="422" y="57">a</text><text x="432" y="57">l</text> </g><rect width="90" height="20" x="442" y="42"></rect><g fill="#eee"><text x="452" y="57">a</text><text x="462" y="57">s</text><text x="472" y="57">s</text><text x="482" y="57">e</text><text x="492" y="57">m</text><text x="502" y="57">b</text><text x="512" y="57">l</text><text x="522" y="57">y</text></g> +<rect width="270" height="20" x="532" y="42"></rect><rect width="800" height="20" x="2" y="62"></rect><rect width="80" height="20" x="2" y="82"></rect><g fill="#eee"><text x="2" y="97">r</text><text x="12" y="97">e</text><text x="22" y="97">y</text><text x="32" y="97">c</text><text x="42" y="97">l</text><text x="52" y="97">e</text><text x="62" y="97">d</text><text x="72" y="97">:</text></g> +<rect width="720" height="20" x="82" y="82"></rect><rect width="10" height="20" x="2" y="102"></rect><g fill="#444" font-weight="bold"><text x="2" y="117">|</text> </g><rect width="210" height="20" x="12" y="102"></rect><g fill="#eee"><text x="22" y="117">1</text><text x="32" y="117">)</text> <text x="52" y="117">s</text><text x="62" y="117">t</text><text x="72" y="117">a</text><text x="82" y="117">p</text><text x="92" y="117">l</text><text x="102" y="117">e</text><text x="112" y="117">s</text> <text x="132" y="117">c</text><text x="142" y="117">o</text><text x="152" y="117">u</text><text x="162" y="117">l</text><text x="172" y="117">d</text> <text x="192" y="117">b</text><text x="202" y="117">e</text> </g><rect fill="#c80" width="70" height="20" x="222" y="102"></rect><g><text x="222" y="117">r</text><text x="232" y="117">e</text><text x="242" y="117">y</text><text x="252" y="117">c</text><text x="262" y="117">l</text><text x="272" y="117">e</text><text x="282" y="117">d</text> </g><rect width="190" height="20" x="292" y="102"></rect><g fill="#eee"><text x="302" y="117">f</text><text x="312" y="117">o</text><text x="322" y="117">r</text> <text x="342" y="117">a</text> <text x="362" y="117">s</text><text x="372" y="117">m</text><text x="382" y="117">a</text><text x="392" y="117">l</text><text x="402" y="117">l</text> <text x="422" y="117">c</text><text x="432" y="117">r</text><text x="442" y="117">e</text><text x="452" y="117">d</text><text x="462" y="117">i</text><text x="472" y="117">t</text></g> +<rect width="320" height="20" x="482" y="102"></rect><rect width="800" height="20" x="2" y="122"></rect><rect width="70" height="20" x="2" y="142"></rect><g fill="#eee"><text x="2" y="157">f</text><text x="12" y="157">l</text><text x="22" y="157">i</text><text x="32" y="157">n</text><text x="42" y="157">e</text><text x="52" y="157">s</text><text x="62" y="157">:</text></g> +<rect width="730" height="20" x="72" y="142"></rect><rect width="10" height="20" x="2" y="162"></rect><g fill="#444" font-weight="bold"><text x="2" y="177">|</text> </g><rect width="310" height="20" x="12" y="162"></rect><g fill="#eee"><text x="22" y="177">…</text><text x="32" y="177">y</text> <text x="52" y="177">s</text><text x="62" y="177">h</text><text x="72" y="177">o</text><text x="82" y="177">u</text><text x="92" y="177">l</text><text x="102" y="177">d</text> <text x="122" y="177">n</text><text x="132" y="177">o</text><text x="142" y="177">t</text> <text x="162" y="177">b</text><text x="172" y="177">e</text> <text x="192" y="177">u</text><text x="202" y="177">s</text><text x="212" y="177">e</text><text x="222" y="177">d</text> <text x="242" y="177">o</text><text x="252" y="177">n</text> <text x="272" y="177">d</text><text x="282" y="177">a</text><text x="292" y="177">t</text><text x="302" y="177">a</text> </g><rect fill="#c80" width="60" height="20" x="322" y="162"></rect><g><text x="322" y="177">f</text><text x="332" y="177">l</text><text x="342" y="177">i</text><text x="352" y="177">n</text><text x="362" y="177">e</text><text x="372" y="177">s</text> </g><rect width="220" height="20" x="382" y="162"></rect><g fill="#eee"><text x="392" y="177">w</text><text x="402" y="177">h</text><text x="412" y="177">i</text><text x="422" y="177">c</text><text x="432" y="177">h</text> <text x="452" y="177">m</text><text x="462" y="177">i</text><text x="472" y="177">g</text><text x="482" y="177">h</text><text x="492" y="177">t</text> <text x="512" y="177">e</text><text x="522" y="177">n</text><text x="532" y="177">d</text> <text x="552" y="177">u</text><text x="562" y="177">p</text> <text x="582" y="177">i</text><text x="592" y="177">n</text></g> +<rect width="200" height="20" x="602" y="162"></rect><rect width="800" height="20" x="2" y="182"></rect><rect width="90" height="20" x="2" y="202"></rect><g fill="#eee"><text x="2" y="217">r</text><text x="12" y="217">e</text><text x="22" y="217">c</text><text x="32" y="217">y</text><text x="42" y="217">c</text><text x="52" y="217">l</text><text x="62" y="217">e</text><text x="72" y="217">r</text><text x="82" y="217">:</text></g> +<rect width="710" height="20" x="92" y="202"></rect><rect width="10" height="20" x="2" y="222"></rect><g fill="#444" font-weight="bold"><text x="2" y="237">|</text> </g><rect width="310" height="20" x="12" y="222"></rect><g fill="#eee"><text x="22" y="237">…</text><text x="32" y="237">i</text><text x="42" y="237">l</text><text x="52" y="237">e</text> <text x="72" y="237">o</text><text x="82" y="237">r</text> <text x="102" y="237">f</text><text x="112" y="237">o</text><text x="122" y="237">l</text><text x="132" y="237">d</text><text x="142" y="237">e</text><text x="152" y="237">r</text> <text x="172" y="237">i</text><text x="182" y="237">s</text> <text x="202" y="237">d</text><text x="212" y="237">e</text><text x="222" y="237">l</text><text x="232" y="237">e</text><text x="242" y="237">t</text><text x="252" y="237">e</text><text x="262" y="237">d</text><text x="272" y="237">,</text> <text x="292" y="237">a</text> <text x="312" y="237">"</text></g><rect fill="#c80" width="80" height="20" x="322" y="222"></rect><g><text x="322" y="237">r</text><text x="332" y="237">e</text><text x="342" y="237">c</text><text x="352" y="237">y</text><text x="362" y="237">c</text><text x="372" y="237">l</text><text x="382" y="237">e</text><text x="392" y="237">r</text></g><rect width="150" height="20" x="402" y="222"></rect><g fill="#eee"><text x="402" y="237">"</text> <text x="422" y="237">p</text><text x="432" y="237">r</text><text x="442" y="237">o</text><text x="452" y="237">g</text><text x="462" y="237">r</text><text x="472" y="237">a</text><text x="482" y="237">m</text> <text x="502" y="237">c</text><text x="512" y="237">o</text><text x="522" y="237">u</text><text x="532" y="237">l</text><text x="542" y="237">d</text></g> +<rect width="250" height="20" x="552" y="222"></rect><rect width="800" height="20" x="2" y="242"></rect><rect width="40" height="20" x="2" y="262"></rect><g fill="#eee"><text x="2" y="277">s</text><text x="12" y="277">r</text><text x="22" y="277">c</text><text x="32" y="277">:</text></g> +<rect width="760" height="20" x="42" y="262"></rect><rect width="10" height="20" x="2" y="282"></rect><g fill="#444" font-weight="bold"><text x="2" y="297">|</text> </g><rect width="50" height="20" x="12" y="282"></rect><g fill="#eee"><text x="22" y="297">3</text><text x="32" y="297">)</text> <text x="52" y="297">"</text></g><rect fill="#c80" width="30" height="20" x="62" y="282"></rect><g><text x="62" y="297">s</text><text x="72" y="297">r</text><text x="82" y="297">c</text></g><rect width="300" height="20" x="92" y="282"></rect><g fill="#eee"><text x="92" y="297">=</text><text x="102" y="297">"</text> <text x="122" y="297">w</text><text x="132" y="297">o</text><text x="142" y="297">u</text><text x="152" y="297">l</text><text x="162" y="297">d</text> <text x="182" y="297">a</text><text x="192" y="297">l</text><text x="202" y="297">l</text><text x="212" y="297">o</text><text x="222" y="297">w</text> <text x="242" y="297">t</text><text x="252" y="297">h</text><text x="262" y="297">e</text> <text x="282" y="297">s</text><text x="292" y="297">p</text><text x="302" y="297">e</text><text x="312" y="297">c</text><text x="322" y="297">i</text><text x="332" y="297">f</text><text x="342" y="297">i</text><text x="352" y="297">c</text><text x="362" y="297">a</text><text x="372" y="297">t</text><text x="382" y="297">…</text></g> +<rect width="410" height="20" x="392" y="282"></rect><rect width="800" height="20" x="2" y="302"></rect><rect width="40" height="20" x="2" y="322"></rect><g fill="#eee"><text x="2" y="337">I</text><text x="12" y="337">S</text><text x="22" y="337">I</text><text x="32" y="337">:</text></g> +<rect width="760" height="20" x="42" y="322"></rect><rect width="10" height="20" x="2" y="342"></rect><g fill="#444" font-weight="bold"><text x="2" y="357">|</text> </g><rect width="310" height="20" x="12" y="342"></rect><g fill="#eee"><text x="22" y="357">…</text> </g><rect fill="#c80" width="30" height="20" x="322" y="342"></rect><g><text x="322" y="357">I</text><text x="332" y="357">S</text><text x="342" y="357">I</text></g> +<rect width="450" height="20" x="352" y="342"></rect><rect width="800" height="20" x="2" y="362"></rect><rect width="40" height="20" x="2" y="382"></rect><g fill="#eee"><text x="2" y="397">U</text><text x="12" y="397">S</text><text x="22" y="397">C</text><text x="32" y="397">:</text></g> +<rect width="760" height="20" x="42" y="382"></rect><rect width="10" height="20" x="2" y="402"></rect><g fill="#444" font-weight="bold"><text x="2" y="417">|</text> </g><rect width="10" height="20" x="12" y="402"></rect><rect fill="#c80" width="30" height="20" x="22" y="402"></rect><g><text x="22" y="417">U</text><text x="32" y="417">S</text><text x="42" y="417">C</text></g><rect width="300" height="20" x="52" y="402"></rect><g fill="#eee"><text x="52" y="417">/</text><text x="62" y="417">I</text><text x="72" y="417">n</text><text x="82" y="417">f</text><text x="92" y="417">o</text><text x="102" y="417">r</text><text x="112" y="417">m</text><text x="122" y="417">a</text><text x="132" y="417">t</text><text x="142" y="417">i</text><text x="152" y="417">o</text><text x="162" y="417">n</text> <text x="182" y="417">S</text><text x="192" y="417">c</text><text x="202" y="417">i</text><text x="212" y="417">e</text><text x="222" y="417">n</text><text x="232" y="417">c</text><text x="242" y="417">e</text><text x="252" y="417">s</text> <text x="272" y="417">I</text><text x="282" y="417">n</text><text x="292" y="417">s</text><text x="302" y="417">t</text><text x="312" y="417">i</text><text x="322" y="417">t</text><text x="332" y="417">u</text><text x="342" y="417">…</text></g> +<rect width="450" height="20" x="352" y="402"></rect><rect width="800" height="20" x="2" y="422"></rect><rect width="60" height="20" x="2" y="442"></rect><g fill="#eee"><text x="2" y="457">b</text><text x="12" y="457">e</text><text x="22" y="457">n</text><text x="32" y="457">t</text><text x="42" y="457">o</text><text x="52" y="457">:</text></g> +<rect width="740" height="20" x="62" y="442"></rect><rect width="10" height="20" x="2" y="462"></rect><g fill="#444" font-weight="bold"><text x="2" y="477">|</text> </g><rect width="310" height="20" x="12" y="462"></rect><g fill="#eee"><text x="22" y="477">…</text><text x="32" y="477">f</text> <text x="52" y="477">5</text><text x="62" y="477">0</text><text x="72" y="477">0</text><text x="82" y="477">0</text><text x="92" y="477">.</text> <text x="122" y="477">R</text><text x="132" y="477">e</text><text x="142" y="477">f</text><text x="152" y="477">e</text><text x="162" y="477">r</text><text x="172" y="477">e</text><text x="182" y="477">n</text><text x="192" y="477">c</text><text x="202" y="477">e</text><text x="212" y="477">:</text> <text x="232" y="477">A</text><text x="242" y="477">p</text><text x="252" y="477">p</text><text x="262" y="477">l</text><text x="272" y="477">e</text><text x="282" y="477">'</text><text x="292" y="477">s</text> <text x="312" y="477">"</text></g><rect fill="#c80" width="50" height="20" x="322" y="462"></rect><g><text x="322" y="477">b</text><text x="332" y="477">e</text><text x="342" y="477">n</text><text x="352" y="477">t</text><text x="362" y="477">o</text></g><rect width="10" height="20" x="372" y="462"></rect><g fill="#eee"><text x="372" y="477">"</text></g> +<rect width="420" height="20" x="382" y="462"></rect><rect width="800" height="20" x="2" y="482"></rect><rect width="100" height="20" x="2" y="502"></rect><g fill="#eee"><text x="2" y="517">m</text><text x="12" y="517">u</text><text x="22" y="517">l</text><text x="32" y="517">t</text><text x="42" y="517">i</text><text x="52" y="517">p</text><text x="62" y="517">a</text><text x="72" y="517">g</text><text x="82" y="517">e</text><text x="92" y="517">:</text></g> +<rect width="700" height="20" x="102" y="502"></rect><rect width="10" height="20" x="2" y="522"></rect><g fill="#444" font-weight="bold"><text x="2" y="537">|</text> </g><rect width="310" height="20" x="12" y="522"></rect><g fill="#eee"><text x="22" y="537">…</text><text x="32" y="537">r</text> <text x="52" y="537">c</text><text x="62" y="537">l</text><text x="72" y="537">i</text><text x="82" y="537">p</text> <text x="102" y="537">t</text><text x="112" y="537">o</text> <text x="132" y="537">a</text> <text x="152" y="537">s</text><text x="162" y="537">i</text><text x="172" y="537">n</text><text x="182" y="537">g</text><text x="192" y="537">l</text><text x="202" y="537">e</text> <text x="222" y="537">p</text><text x="232" y="537">a</text><text x="242" y="537">g</text><text x="252" y="537">e</text> <text x="272" y="537">o</text><text x="282" y="537">f</text> <text x="302" y="537">a</text> </g><rect fill="#c80" width="90" height="20" x="322" y="522"></rect><g><text x="322" y="537">m</text><text x="332" y="537">u</text><text x="342" y="537">l</text><text x="352" y="537">t</text><text x="362" y="537">i</text><text x="372" y="537">p</text><text x="382" y="537">a</text><text x="392" y="537">g</text><text x="402" y="537">e</text> </g><rect width="120" height="20" x="412" y="522"></rect><g fill="#eee"><text x="422" y="537">d</text><text x="432" y="537">o</text><text x="442" y="537">c</text><text x="452" y="537">u</text><text x="462" y="537">m</text><text x="472" y="537">e</text><text x="482" y="537">n</text><text x="492" y="537">t</text> <text x="512" y="537">o</text><text x="522" y="537">r</text></g> +<rect width="270" height="20" x="532" y="522"></rect><rect width="800" height="20" x="2" y="542"></rect><rect width="90" height="20" x="2" y="562"></rect><g fill="#eee"><text x="2" y="577">R</text><text x="12" y="577">e</text><text x="22" y="577">y</text><text x="32" y="577">,</text> <text x="52" y="577">d</text><text x="62" y="577">e</text><text x="72" y="577">l</text><text x="82" y="577">:</text></g> +<rect width="710" height="20" x="92" y="562"></rect><rect width="10" height="20" x="2" y="582"></rect><g fill="#444" font-weight="bold"><text x="2" y="597">|</text> </g><rect width="80" height="20" x="12" y="582"></rect><g fill="#eee"><text x="22" y="597">M</text><text x="32" y="597">a</text><text x="42" y="597">r</text><text x="52" y="597">i</text><text x="62" y="597">n</text><text x="72" y="597">a</text> </g><rect fill="#c80" width="30" height="20" x="92" y="582"></rect><g><text x="92" y="597">d</text><text x="102" y="597">e</text><text x="112" y="597">l</text> </g><rect width="10" height="20" x="122" y="582"></rect><rect fill="#c80" width="30" height="20" x="132" y="582"></rect><g><text x="132" y="597">R</text><text x="142" y="597">e</text><text x="152" y="597">y</text></g><rect width="100" height="20" x="162" y="582"></rect><g fill="#eee"><text x="162" y="597">,</text> <text x="182" y="597">C</text><text x="192" y="597">A</text> <text x="212" y="597">9</text><text x="222" y="597">0</text><text x="232" y="597">2</text><text x="242" y="597">9</text><text x="252" y="597">2</text></g> +<rect width="540" height="20" x="262" y="582"></rect><rect width="800" height="20" x="2" y="602"></rect><rect width="160" height="20" x="2" y="622"></rect><g fill="#eee"><text x="2" y="637">E</text><text x="12" y="637">M</text><text x="22" y="637">a</text><text x="32" y="637">i</text><text x="42" y="637">l</text><text x="52" y="637">,</text> <text x="72" y="637">e</text><text x="82" y="637">d</text><text x="92" y="637">u</text><text x="102" y="637">,</text> <text x="122" y="637">i</text><text x="132" y="637">s</text><text x="142" y="637">i</text><text x="152" y="637">:</text></g> +<rect width="640" height="20" x="162" y="622"></rect><rect width="10" height="20" x="2" y="642"></rect><g fill="#444" font-weight="bold"><text x="2" y="657">|</text> </g><rect width="10" height="20" x="12" y="642"></rect><rect fill="#c80" width="50" height="20" x="22" y="642"></rect><g><text x="22" y="657">E</text><text x="32" y="657">M</text><text x="42" y="657">a</text><text x="52" y="657">i</text><text x="62" y="657">l</text></g><rect width="90" height="20" x="72" y="642"></rect><g fill="#eee"><text x="72" y="657">:</text> <text x="92" y="657">r</text><text x="102" y="657">o</text><text x="112" y="657">g</text><text x="122" y="657">e</text><text x="132" y="657">r</text><text x="142" y="657">s</text><text x="152" y="657">@</text></g><rect fill="#c80" width="30" height="20" x="162" y="642"></rect><g><text x="162" y="657">i</text><text x="172" y="657">s</text><text x="182" y="657">i</text></g><rect width="10" height="20" x="192" y="642"></rect><g fill="#eee"><text x="192" y="657">.</text></g><rect fill="#c80" width="30" height="20" x="202" y="642"></rect><g><text x="202" y="657">e</text><text x="212" y="657">d</text><text x="222" y="657">u</text></g> +<rect width="570" height="20" x="232" y="642"></rect><rect width="800" height="20" x="2" y="662"></rect><rect width="100" height="20" x="2" y="682"></rect><g fill="#eee"><text x="2" y="697">e</text><text x="12" y="697">l</text><text x="22" y="697">e</text><text x="32" y="697">c</text><text x="42" y="697">t</text><text x="52" y="697">o</text><text x="62" y="697">n</text><text x="72" y="697">i</text><text x="82" y="697">c</text><text x="92" y="697">:</text></g> +<rect width="700" height="20" x="102" y="682"></rect><rect width="10" height="20" x="2" y="702"></rect><g fill="#444" font-weight="bold"><text x="2" y="717">|</text> </g><rect width="150" height="20" x="12" y="702"></rect><g fill="#eee"><text x="22" y="717">d</text><text x="32" y="717">r</text><text x="42" y="717">a</text><text x="52" y="717">w</text><text x="62" y="717">e</text><text x="72" y="717">r</text> <text x="92" y="717">o</text><text x="102" y="717">f</text> <text x="122" y="717">t</text><text x="132" y="717">h</text><text x="142" y="717">e</text> </g><rect fill="#c80" width="90" height="20" x="162" y="702"></rect><g><text x="162" y="717">e</text><text x="172" y="717">l</text><text x="182" y="717">e</text><text x="192" y="717">c</text><text x="202" y="717">t</text><text x="212" y="717">o</text><text x="222" y="717">n</text><text x="232" y="717">i</text><text x="242" y="717">c</text> </g><rect width="170" height="20" x="252" y="702"></rect><g fill="#eee"><text x="262" y="717">d</text><text x="272" y="717">e</text><text x="282" y="717">s</text><text x="292" y="717">k</text> <text x="312" y="717">o</text><text x="322" y="717">n</text> <text x="342" y="717">h</text><text x="352" y="717">o</text><text x="362" y="717">m</text><text x="372" y="717">e</text> <text x="392" y="717">P</text><text x="402" y="717">C</text><text x="412" y="717">s</text></g> +<rect width="380" height="20" x="422" y="702"></rect><rect width="10" height="20" x="2" y="722"></rect><g fill="#444" font-weight="bold"><text x="2" y="737">|</text> </g><rect width="150" height="20" x="12" y="722"></rect><g fill="#eee"><text x="132" y="737">3</text><text x="142" y="737">)</text> </g><rect fill="#c80" width="90" height="20" x="162" y="722"></rect><g><text x="162" y="737">e</text><text x="172" y="737">l</text><text x="182" y="737">e</text><text x="192" y="737">c</text><text x="202" y="737">t</text><text x="212" y="737">o</text><text x="222" y="737">n</text><text x="232" y="737">i</text><text x="242" y="737">c</text> </g><rect width="300" height="20" x="252" y="722"></rect><g fill="#eee"><text x="262" y="737">s</text><text x="272" y="737">t</text><text x="282" y="737">a</text><text x="292" y="737">p</text><text x="302" y="737">l</text><text x="312" y="737">e</text><text x="322" y="737">s</text> <text x="342" y="737">s</text><text x="352" y="737">h</text><text x="362" y="737">o</text><text x="372" y="737">u</text><text x="382" y="737">l</text><text x="392" y="737">d</text> <text x="412" y="737">h</text><text x="422" y="737">a</text><text x="432" y="737">v</text><text x="442" y="737">e</text> <text x="462" y="737">a</text> <text x="482" y="737">s</text><text x="492" y="737">t</text><text x="502" y="737">a</text><text x="512" y="737">n</text><text x="522" y="737">d</text><text x="532" y="737">a</text><text x="542" y="737">…</text></g> </g> </svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/lib/__init__.py new/mwic-0.7.8/lib/__init__.py --- old/mwic-0.7.7/lib/__init__.py 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/lib/__init__.py 2019-11-16 18:11:55.000000000 +0100 @@ -2,5 +2,4 @@ mwic's private modules ''' -# pylint: disable=pointless-statement,not-an-iterable -lambda: (yield from 0) # Python >= 3.3 is required +type(lambda: (yield from [])) # Python >= 3.3 is required diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/lib/cli.py new/mwic-0.7.8/lib/cli.py --- old/mwic-0.7.7/lib/cli.py 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/lib/cli.py 2019-11-16 18:11:55.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2013-2018 Jakub Wilk <jw...@jwilk.net> +# Copyright © 2013-2019 Jakub Wilk <jw...@jwilk.net> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the “Software”), to deal @@ -32,14 +32,16 @@ import enchant.tokenize class lib: + # pylint: disable=import-outside-toplevel from . import colors from . import data from . import extdict from . import intdict from . import pager from . import text + # pylint: enable=import-outside-toplevel -__version__ = '0.7.7' +__version__ = '0.7.8' class VersionAction(argparse.Action): @@ -48,7 +50,7 @@ option_strings=option_strings, dest=dest, nargs=0, - help="show program's version information and exit" + help='show version information and exit' ) def __call__(self, parser, namespace, values, option_string=None): @@ -63,7 +65,8 @@ if isinstance(enchant_version, bytes): enchant_version = enchant_version.decode('ASCII', 'replace') print(' + Enchant {0}'.format(enchant_version)) - print('+ regex {0}'.format(lib.intdict.re.__version__)) + regex = lib.intdict.re + print('+ regex {0}'.format(regex.__version__)) # pylint: disable=no-member parser.exit() def main(): @@ -157,7 +160,7 @@ encoding=encoding, errors=enc_errors, ) - except IOError as exc: + except OSError as exc: if options.traceback: raise msg = '{prog}: {path}: {exc}'.format(prog=ap.prog, path=path, exc=exc.strerror) @@ -195,12 +198,12 @@ continue else: certainty = 0 - for i, ch in enumerate(word, start=pos): # pylint: disable=unused-variable + for i, dummy in enumerate(word, start=pos): taken[i] = True ctxt.misspellings.add(word, line, pos, certainty) for word, pos in ctxt.intdict.find(line): assert len(word) >= 1 - for i, ch in enumerate(word, start=pos): + for i, dummy in enumerate(word, start=pos): if taken[i]: break else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/lib/colors.py new/mwic-0.7.8/lib/colors.py --- old/mwic-0.7.7/lib/colors.py 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/lib/colors.py 2019-11-16 18:11:55.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2015 Jakub Wilk <jw...@jwilk.net> +# Copyright © 2015-2019 Jakub Wilk <jw...@jwilk.net> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the “Software”), to deal @@ -27,7 +27,7 @@ import unicodedata class _seq: - dim = '\x1B[1;30m' + dim = '\x1B[90m' off = '\x1B[0m' warn = '\x1B[30;43m' error = '\x1B[30;41m' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/lib/intdict.py new/mwic-0.7.8/lib/intdict.py --- old/mwic-0.7.7/lib/intdict.py 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/lib/intdict.py 2019-11-16 18:11:55.000000000 +0100 @@ -25,7 +25,6 @@ but are not present in standard dictionaries. ''' -import errno import os import regex as re @@ -91,9 +90,7 @@ path = os.path.join(datadir, lang) try: file = open(path, 'rt', encoding='UTF-8') - except IOError as exc: - if exc.errno != errno.ENOENT: - raise + except FileNotFoundError: [lang, *suffix] = lang.rsplit('-', 1) if suffix: continue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/private/run-pylint new/mwic-0.7.8/private/run-pylint --- old/mwic-0.7.7/private/run-pylint 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/private/run-pylint 2019-11-16 18:11:55.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright © 2015-2018 Jakub Wilk <jw...@jwilk.net> +# Copyright © 2015-2019 Jakub Wilk <jw...@jwilk.net> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the “Software”), to deal @@ -30,8 +30,8 @@ fi log=$(mktemp -t pylint.XXXXXX) "$PYTHON" -m pylint "$@" > "$log" || [ $? != 1 ] -! grep '^\w:' "$log" \ -| grep -v -P '^\w: (?!lib/).*: missing-docstring ' \ +! grep -P '^\S+:' "$log" \ +| grep -v -P '^(?!lib/).*: missing-(\w+-)?docstring ' \ | grep '.' || exit 1 rm "$log" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/coverage new/mwic-0.7.8/tests/coverage --- old/mwic-0.7.7/tests/coverage 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/tests/coverage 2019-11-16 18:11:55.000000000 +0100 @@ -2,13 +2,13 @@ Name Stmts Miss Branch BrPart Cover Missing ------------------------------------------------------------- -lib/__init__.py 1 0 2 1 67% 6->exit -lib/cli.py 207 44 100 19 74% 55-67, 110, 121-127, 146, 160, 173, 180, 207-208, 219, 222-224, 240-243, 264, 268, 271-273, 278, 294-302, 311-313, 109->110, 120->121, 133->135, 145->146, 159->160, 171->173, 179->180, 206->207, 218->219, 221->222, 239->240, 251->253, 253->215, 263->264, 267->268, 270->271, 277->278, 293->294, 306->259 +lib/__init__.py 1 0 2 1 67% 5->exit +lib/cli.py 219 41 102 20 76% 62-63, 114, 125-131, 151, 163-169, 173, 187, 194, 221-222, 233, 236-238, 254-257, 278, 282, 285-287, 292, 308-316, 325-327, 65->67, 113->114, 124->125, 137->139, 150->151, 172->173, 185->187, 193->194, 220->221, 232->233, 235->236, 253->254, 265->267, 267->229, 277->278, 281->282, 284->285, 291->292, 307->308, 320->273 lib/colors.py 36 5 12 3 83% 38, 45, 52-53, 62, 44->45, 51->52, 61->62 lib/data.py 56 3 14 2 90% 38-39, 86, 35->38, 85->86 lib/extdict.py 61 0 32 2 98% 84->88, 98->101 -lib/intdict.py 96 1 26 1 98% 96, 95->96 +lib/intdict.py 93 0 24 0 100% lib/pager.py 40 25 12 1 31% 33-34, 40, 50-76, 47->50 lib/text.py 28 0 16 0 100% ------------------------------------------------------------- -TOTAL 525 78 214 29 82% +TOTAL 534 74 214 29 82% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/multiword-its-goal.exp new/mwic-0.7.8/tests/multiword-its-goal.exp --- old/mwic-0.7.7/tests/multiword-its-goal.exp 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/multiword-its-goal.exp 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,8 @@ +It's goal: +| It's goal is to… + ^^^^^^^^^ + +It’s goal: +| It’s goal is to… + ^^^^^^^^^ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/multiword-its-goal.txt new/mwic-0.7.8/tests/multiword-its-goal.txt --- old/mwic-0.7.7/tests/multiword-its-goal.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/multiword-its-goal.txt 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,3 @@ +It's goal is to… +It’s goal is to… +Its goal is to… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/multiword-pubic-key.exp new/mwic-0.7.8/tests/multiword-pubic-key.exp --- old/mwic-0.7.7/tests/multiword-pubic-key.exp 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/multiword-pubic-key.exp 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,8 @@ +pubic key: +| pubic key + ^^^^^^^^^ + +pubic keys: +| pubic keys + ^^^^^^^^^^ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/multiword-pubic-key.txt new/mwic-0.7.8/tests/multiword-pubic-key.txt --- old/mwic-0.7.7/tests/multiword-pubic-key.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/multiword-pubic-key.txt 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,5 @@ +pubic key +pubic keys + +public key +public keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/multiword-regarding.exp new/mwic-0.7.8/tests/multiword-regarding.exp --- old/mwic-0.7.7/tests/multiword-regarding.exp 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/multiword-regarding.exp 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,4 @@ +regarding to: +| regarding to stuff + ^^^^^^^^^^^^ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/multiword-regarding.txt new/mwic-0.7.8/tests/multiword-regarding.txt --- old/mwic-0.7.7/tests/multiword-regarding.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/multiword-regarding.txt 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,2 @@ +regarding to stuff +regarding stuff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/test_blackbox.py new/mwic-0.7.8/tests/test_blackbox.py --- old/mwic-0.7.7/tests/test_blackbox.py 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/tests/test_blackbox.py 2019-11-16 18:11:55.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright © 2014-2018 Jakub Wilk <jw...@jwilk.net> +# Copyright © 2014-2019 Jakub Wilk <jw...@jwilk.net> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the “Software”), to deal @@ -18,12 +18,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import errno import glob import io import os import sys -import unittest +import unittest.mock import nose from nose.tools import ( @@ -38,11 +37,10 @@ here = os.path.relpath(here) def _get_output(path, language): + argv = ['mwic', '--language', language, path] binstdout = io.BytesIO() - [old_stdout, old_argv] = [sys.stdout, sys.argv] - try: - sys.argv = ['mwic', '--language', language, path] - textstdout = sys.stdout = io.TextIOWrapper(binstdout, encoding='UTF-8') + textstdout = io.TextIOWrapper(binstdout, encoding='UTF-8') + with unittest.mock.patch.multiple(sys, argv=argv, stdout=textstdout): try: try: M.main() @@ -53,8 +51,6 @@ return binstdout.getvalue().decode('UTF-8') finally: textstdout.close() - finally: - [sys.stdout, sys.argv] = [old_stdout, old_argv] def _test_text(xpath): assert xpath.endswith('.exp') @@ -71,11 +67,8 @@ altxpath = xpath[:-4] + '.alt' try: file = open(altxpath, 'rt', encoding='UTF-8') - except IOError as exc: - if exc.errno == errno.ENOENT: - pass - else: - raise + except FileNotFoundError: + pass else: with file: alt_expected = file.read() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/test_cli.py new/mwic-0.7.8/tests/test_cli.py --- old/mwic-0.7.7/tests/test_cli.py 1970-01-01 01:00:00.000000000 +0100 +++ new/mwic-0.7.8/tests/test_cli.py 2019-11-16 18:11:55.000000000 +0100 @@ -0,0 +1,47 @@ +# Copyright © 2019 Jakub Wilk <jw...@jwilk.net> +# +# 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. + +import argparse +import io +import unittest.mock + +from nose.tools import ( + assert_equal, + assert_is_instance, + assert_not_equal, +) + +import lib.cli + +def test_version_action(): + action = lib.cli.VersionAction(['--version']) + stdout = io.StringIO() + ap = argparse.ArgumentParser() + with unittest.mock.patch('sys.stdout', stdout): + try: + action(ap, None, None) + raise SystemExit(...) + except SystemExit as exc: + assert_equal(exc.code, 0) + s = stdout.getvalue() + assert_is_instance(s, str) + assert_not_equal(s, '') + +# vim:ts=4 sts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mwic-0.7.7/tests/test_colors.py new/mwic-0.7.8/tests/test_colors.py --- old/mwic-0.7.7/tests/test_colors.py 2018-11-12 17:42:35.000000000 +0100 +++ new/mwic-0.7.8/tests/test_colors.py 2019-11-16 18:11:55.000000000 +0100 @@ -19,10 +19,7 @@ # SOFTWARE. import io -try: - from unittest import mock -except ImportError: - import mock +import unittest.mock from nose.tools import ( assert_equal, @@ -35,7 +32,7 @@ io.BytesIO(), encoding=encoding, ) - return mock.patch('sys.stdout', stdout) + return unittest.mock.patch('sys.stdout', stdout) @with_stdout('UTF-8') def test_control_characters():
