commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2020-08-04 20:22:02
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.3592 (New)
Package is "python-coloredlogs"
Tue Aug 4 20:22:02 2020 rev:8 rq:824186 version:14.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2020-04-01 19:20:12.987581816 +0200
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new.3592/python-coloredlogs.changes
2020-08-04 20:22:13.097000104 +0200
@@ -1,0 +2,5 @@
+Sat Aug 1 07:23:57 UTC 2020 - John Vandenberg
+
+- Fix minimum dependency version of python-humanfriendly
+
+---
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.UicpeU/_old 2020-08-04 20:22:14.101000233 +0200
+++ /var/tmp/diff_new_pack.UicpeU/_new 2020-08-04 20:22:14.105000233 +0200
@@ -30,7 +30,7 @@
# With using alternatives, we don't have versionless command in time of %%check
Patch0: test_cli_conversion_test.patch
BuildRequires: %{python_module capturer >= 2.4}
-BuildRequires: %{python_module humanfriendly >= 6.1}
+BuildRequires: %{python_module humanfriendly >= 7.1}
BuildRequires: %{python_module mock >= 1.0.1}
BuildRequires: %{python_module pytest >= 3.0.3}
BuildRequires: %{python_module pytest-cov >= 2.3.1}
@@ -39,7 +39,7 @@
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-capturer >= 2.4
-Requires: python-humanfriendly >= 3.2
+Requires: python-humanfriendly >= 7.1
Requires(post): update-alternatives
Requires(postun): update-alternatives
Recommends: python-verboselogs >= 1.7
commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2020-04-01 19:20:06
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.3248 (New)
Package is "python-coloredlogs"
Wed Apr 1 19:20:06 2020 rev:7 rq:790586 version:14.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2020-02-15 22:25:49.735322981 +0100
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new.3248/python-coloredlogs.changes
2020-04-01 19:20:12.987581816 +0200
@@ -1,0 +2,20 @@
+Wed Apr 1 11:52:27 UTC 2020 - Marketa Calabkova
+
+- Update to 14.0
+ * Merged pull request `#80`_ that drops support for Python 3.4 which
+has gone end-of-life and now represents less than 1% of PyPI downloads.
+ * Improved compatibility with the Python standard library by changing
+the order of positional arguments received by the initializer of the
+:class:`~coloredlogs.ColoredFormatter` class (as suggested in `#64`_
+and `#75`_).
+ * Add support for the ``%(username)s`` field (requested in `#76`_) and
properly
+document supported custom fields.
+ * Consistently use ``console`` highlighting in documentation.
+ * Fix a broken link in the readme.
+ * Merge pull request `#79`_ which adds support for Python 3.8.
+ * Fix support for custom log record factories and add a test to avoid
+regressions (`#47`_, `#59`_).
+ * Change ``make screenshots`` to be Python 3 compatible and document
+additional requirements (`#65`_).
+
+---
Old:
coloredlogs-11.0.tar.gz
New:
coloredlogs-14.0.tar.gz
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.Eixyvk/_old 2020-04-01 19:20:14.395582450 +0200
+++ /var/tmp/diff_new_pack.Eixyvk/_new 2020-04-01 19:20:14.403582453 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-coloredlogs
-Version:11.0
+Version:14.0
Release:0
Summary:Colored terminal output for Python's logging module
License:MIT
@@ -27,7 +27,7 @@
URL:https://github.com/xolox/python-coloredlogs
Source:
https://files.pythonhosted.org/packages/source/c/coloredlogs/coloredlogs-%{version}.tar.gz
# PATCH-FIX-OPENSUSE test_cli_conversion_test.patch mc...@suse.com
-# With using alternatives, we don't have versionless command in time of %check
+# With using alternatives, we don't have versionless command in time of %%check
Patch0: test_cli_conversion_test.patch
BuildRequires: %{python_module capturer >= 2.4}
BuildRequires: %{python_module humanfriendly >= 6.1}
++ coloredlogs-11.0.tar.gz -> coloredlogs-14.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/coloredlogs-11.0/CHANGELOG.rst
new/coloredlogs-14.0/CHANGELOG.rst
--- old/coloredlogs-11.0/CHANGELOG.rst 2020-02-15 00:18:02.0 +0100
+++ new/coloredlogs-14.0/CHANGELOG.rst 2020-02-16 21:50:46.0 +0100
@@ -11,6 +11,90 @@
.. _Keep a Changelog: http://keepachangelog.com/
.. _semantic versioning: http://semver.org/
+`Release 14.0`_ (2020-02-16)
+
+
+Integrate native Windows 10 support for ANSI escape sequences (`#71`_, `#72`_).
+
+Native support for ANSI escape sequences was added to Windows 10 after its
+initial release, specifically in release 10.0.14393. I've now updated
+:pypi:`coloredlogs` and :pypi:`humanfriendly` to detect and enable this "new"
+native support.
+
+Windows 10 seems to comprise the majority of Windows installations worldwide so
+in the interest of "looking forward" I've decided to drop the :pypi:`colorama`
+requirement, given that it has now become a minority use case.
+
+Hopefully most existing users will not experience any regression because they
+previously installed :pypi:`colorama` already, and when available it will still
+be used. However new installations on older Windows systems now require users
+to install :pypi:`colorama` separately. This has been documented in the readme
+in an attempt to minimize resulting confusion.
+
+PS. In case anyone is wondering: I decided that giving a major Windows support
+update in :pypi:`coloredlogs` the version 13.0 was asking for trouble, so I
+decided not to do that .
+
+.. _Release 14.0:
https://github.com/xolox/python-coloredlogs/compare/12.0...14.0
+.. _#71: https://github.com/xolox/python-coloredlogs/issues/71
+.. _#72: https://github.com/xolox/python-coloredlogs/pull/72
+
+`Release 12.0`_ (2020-02-16)
+
+
+Two
commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2020-02-15 22:25:25
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.26092 (New)
Package is "python-coloredlogs"
Sat Feb 15 22:25:25 2020 rev:6 rq:774498 version:11.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2019-05-03 22:47:57.331979818 +0200
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new.26092/python-coloredlogs.changes
2020-02-15 22:25:49.735322981 +0100
@@ -1,0 +2,12 @@
+Sat Feb 15 08:30:15 CET 2020 - Matej Cepl
+
+- Update to 11.0:
+ - This is a maintenance release that drops Python 2.6 support,
+adds Python 3.7 support and merges quite a few minor pull
+requests. The major version number was bumped because of the
+compatibility changes.
+Complete list of (really small) changes is on
+
https://github.com/xolox/python-coloredlogs/blob/master/CHANGELOG.rst#release-11-0-2020-02-14
+ - Update test_cli_conversion_test.patch
+
+---
Old:
coloredlogs-10.0.tar.gz
New:
coloredlogs-11.0.tar.gz
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.ZqpzJ9/_old 2020-02-15 22:25:50.163323213 +0100
+++ /var/tmp/diff_new_pack.ZqpzJ9/_new 2020-02-15 22:25:50.167323214 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-coloredlogs
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2016, Martin Hauke
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-coloredlogs
-Version:10.0
+Version:11.0
Release:0
Summary:Colored terminal output for Python's logging module
License:MIT
@@ -30,7 +30,7 @@
# With using alternatives, we don't have versionless command in time of %check
Patch0: test_cli_conversion_test.patch
BuildRequires: %{python_module capturer >= 2.4}
-BuildRequires: %{python_module humanfriendly >= 3.2}
+BuildRequires: %{python_module humanfriendly >= 6.1}
BuildRequires: %{python_module mock >= 1.0.1}
BuildRequires: %{python_module pytest >= 3.0.3}
BuildRequires: %{python_module pytest-cov >= 2.3.1}
@@ -75,9 +75,8 @@
%check
# test_auto_install - requires the install to the system to be actually
complete
-# test_plain_text_output_format - random hickupy test
export PATH=%{buildroot}%{_bindir}:$PATH
-%pytest coloredlogs/tests.py -k 'not (test_auto_install or
test_plain_text_output_format)'
+%pytest coloredlogs/tests.py -k 'not test_auto_install'
%files %{python_files}
%doc README.rst CHANGELOG.rst
++ coloredlogs-10.0.tar.gz -> coloredlogs-11.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/coloredlogs-10.0/CHANGELOG.rst
new/coloredlogs-11.0/CHANGELOG.rst
--- old/coloredlogs-10.0/CHANGELOG.rst 2018-05-13 23:01:32.0 +0200
+++ new/coloredlogs-11.0/CHANGELOG.rst 2020-02-15 00:18:02.0 +0100
@@ -11,6 +11,48 @@
.. _Keep a Changelog: http://keepachangelog.com/
.. _semantic versioning: http://semver.org/
+`Release 11.0`_ (2020-02-14)
+
+
+This is a maintenance release that drops Python 2.6 support, adds Python 3.7
+support and merges quite a few minor pull requests. The major version number
+was bumped because of the compatibility changes.
+
+**Merged pull requests:**
+
+- `#58`_: Don't import :mod:`coloredlogs` if ``$COLOREDLOGS_AUTO_INSTALL`` is
+ set but empty.
+
+- `#60`_: Fix :pypi:`flake8` messages to help stabilize Travis CI builds.
+
+- `#61`_: Drop support for Python 2.6 to help stabilize Travis CI builds.
+
+- `#62`_: Use SVG badge in README for consistency.
+
+- `#69`_: Handle negative-offset timezones in tests.
+
+- `#70`_: Use :func:`subprocess.check_call()` in the test suite to ensure that
+ external commands succeed.
+
+- `#74`_: Fix :exc:`~exceptions.TypeError` on MacOS on Python 3 in the
+ :mod:`~coloredlogs.converter` module.
+
+**Other changes:**
+
+- Start testing on Python 3.7 (and document compatibility).
+- Workaround Python 3.7 regression in test suite.
+- Update ``Makefile`` to use Python 3 for local development.
+- Merge MacOS on Travis CI fixes from :pypi:`humanfriendly`.
+
+.. _Release 11.0:
https://github.com/xolox/python-coloredlogs/compare/10.0...11.0
+.. _#58: https://github.com/xolox/python-coloredlogs/pull/58
+.. _#60: https://github.com/xolox/python-coloredlogs/pull/60
+..
commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2019-05-03 22:47:54
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.5148 (New)
Package is "python-coloredlogs"
Fri May 3 22:47:54 2019 rev:5 rq:700395 version:10.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2019-02-24 17:14:47.680457026 +0100
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new.5148/python-coloredlogs.changes
2019-05-03 22:47:57.331979818 +0200
@@ -1,0 +2,6 @@
+Fri May 3 14:04:05 UTC 2019 - Matej Cepl
+
+- Add test_cli_conversion_test.patch, because we don't have versionless
+ coloredlogs in time of %check.
+
+---
New:
test_cli_conversion_test.patch
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.1gDf0e/_old 2019-05-03 22:47:57.875981067 +0200
+++ /var/tmp/diff_new_pack.1gDf0e/_new 2019-05-03 22:47:57.879981076 +0200
@@ -26,6 +26,9 @@
Group: Development/Languages/Python
URL:https://github.com/xolox/python-coloredlogs
Source:
https://files.pythonhosted.org/packages/source/c/coloredlogs/coloredlogs-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE test_cli_conversion_test.patch mc...@suse.com
+# With using alternatives, we don't have versionless command in time of %check
+Patch0: test_cli_conversion_test.patch
BuildRequires: %{python_module capturer >= 2.4}
BuildRequires: %{python_module humanfriendly >= 3.2}
BuildRequires: %{python_module mock >= 1.0.1}
@@ -54,6 +57,7 @@
%prep
%setup -q -n coloredlogs-%{version}
+%autopatch -p1
%build
%python_build
@@ -70,10 +74,10 @@
%python_uninstall_alternative coloredlogs
%check
-# test_cli_conversion - requires coloredlogs binary available, we don't have
it at this point
# test_auto_install - requires the install to the system to be actually
complete
# test_plain_text_output_format - random hickupy test
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_version} coloredlogs/tests.py -v -k 'not (test_cli_conversion
or test_auto_install or test_plain_text_output_format)'
+export PATH=%{buildroot}%{_bindir}:$PATH
+%pytest coloredlogs/tests.py -k 'not (test_auto_install or
test_plain_text_output_format)'
%files %{python_files}
%doc README.rst CHANGELOG.rst
++ test_cli_conversion_test.patch ++
--- a/coloredlogs/tests.py
+++ b/coloredlogs/tests.py
@@ -82,6 +82,7 @@ PATTERN_INCLUDING_MILLISECONDS = re.comp
\s (?P .* )
''', re.VERBOSE)
+pyver = '.'.join(str(x) for x in sys.version_info[:2])
def setUpModule():
"""Speed up the tests by disabling the demo's artificial delay."""
@@ -505,7 +506,8 @@ class ColoredLogsTestCase(TestCase):
def test_cli_conversion(self):
"""Test the command line HTML conversion."""
-output = main('coloredlogs', '--convert', 'coloredlogs', '--demo',
capture=True)
+output = main('coloredlogs-{}'.format(pyver), '--convert',
+ 'coloredlogs-{}'.format(pyver), '--demo', capture=True)
# Make sure the output is encoded as HTML.
assert '
commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2019-02-24 17:14:43
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.28833 (New)
Package is "python-coloredlogs"
Sun Feb 24 17:14:43 2019 rev:4 rq:676164 version:10.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2018-12-13 19:41:31.549237205 +0100
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new.28833/python-coloredlogs.changes
2019-02-24 17:14:47.680457026 +0100
@@ -1,0 +2,5 @@
+Thu Feb 14 15:16:19 UTC 2019 - Tomáš Chvátal
+
+- Disable one flaky test
+
+---
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.Arez85/_old 2019-02-24 17:14:48.108456950 +0100
+++ /var/tmp/diff_new_pack.Arez85/_new 2019-02-24 17:14:48.108456950 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-coloredlogs
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016, Martin Hauke
#
# All modifications and additions to the file contributed by third parties
@@ -72,7 +72,8 @@
%check
# test_cli_conversion - requires coloredlogs binary available, we don't have
it at this point
# test_auto_install - requires the install to the system to be actually
complete
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_version} coloredlogs/tests.py -v -k 'not (test_cli_conversion
or test_auto_install)'
+# test_plain_text_output_format - random hickupy test
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_version} coloredlogs/tests.py -v -k 'not (test_cli_conversion
or test_auto_install or test_plain_text_output_format)'
%files %{python_files}
%doc README.rst CHANGELOG.rst
commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2018-12-13 19:41:31
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new.28833 (New)
Package is "python-coloredlogs"
Thu Dec 13 19:41:31 2018 rev:3 rq:653980 version:10.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2018-08-22 14:20:47.974415134 +0200
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new.28833/python-coloredlogs.changes
2018-12-13 19:41:31.549237205 +0100
@@ -1,0 +2,5 @@
+Tue Dec 4 12:46:45 UTC 2018 - Matej Cepl
+
+- Remove superfluous devel dependency for noarch package
+
+---
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.WSlBiS/_old 2018-12-13 19:41:31.929236801 +0100
+++ /var/tmp/diff_new_pack.WSlBiS/_new 2018-12-13 19:41:31.929236801 +0100
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -27,7 +27,6 @@
URL:https://github.com/xolox/python-coloredlogs
Source:
https://files.pythonhosted.org/packages/source/c/coloredlogs/coloredlogs-%{version}.tar.gz
BuildRequires: %{python_module capturer >= 2.4}
-BuildRequires: %{python_module devel}
BuildRequires: %{python_module humanfriendly >= 3.2}
BuildRequires: %{python_module mock >= 1.0.1}
BuildRequires: %{python_module pytest >= 3.0.3}
commit python-coloredlogs for openSUSE:Factory
Hello community,
here is the log from the commit of package python-coloredlogs for
openSUSE:Factory checked in at 2018-08-22 14:20:06
Comparing /work/SRC/openSUSE:Factory/python-coloredlogs (Old)
and /work/SRC/openSUSE:Factory/.python-coloredlogs.new (New)
Package is "python-coloredlogs"
Wed Aug 22 14:20:06 2018 rev:2 rq:630723 version:10.0
Changes:
--- /work/SRC/openSUSE:Factory/python-coloredlogs/python-coloredlogs.changes
2018-05-15 10:31:21.520691080 +0200
+++
/work/SRC/openSUSE:Factory/.python-coloredlogs.new/python-coloredlogs.changes
2018-08-22 14:20:47.974415134 +0200
@@ -1,0 +2,7 @@
+Tue Aug 21 08:34:11 UTC 2018 - tchva...@suse.com
+
+- Version update to 10.0:
+ * Many upstream changes to enumerate, see CHANGELOG.rst
+- Enable testsuite
+
+---
Old:
coloredlogs-7.3.tar.gz
New:
coloredlogs-10.0.tar.gz
Other differences:
--
++ python-coloredlogs.spec ++
--- /var/tmp/diff_new_pack.gFnVtN/_old 2018-08-22 14:20:48.286415873 +0200
+++ /var/tmp/diff_new_pack.gFnVtN/_new 2018-08-22 14:20:48.290415882 +0200
@@ -14,37 +14,34 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with test
Name: python-coloredlogs
-Version:7.3
+Version:10.0
Release:0
-License:MIT
Summary:Colored terminal output for Python's logging module
-Url:https://coloredlogs.readthedocs.io
+License:MIT
Group: Development/Languages/Python
+URL:https://github.com/xolox/python-coloredlogs
Source:
https://files.pythonhosted.org/packages/source/c/coloredlogs/coloredlogs-%{version}.tar.gz
-BuildRequires: fdupes
-BuildRequires: python-rpm-macros
+BuildRequires: %{python_module capturer >= 2.4}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module humanfriendly >= 3.2}
-BuildRequires: %{python_module setuptools}
-%if %{with test}
-BuildRequires: %{python_module capturer >= 2.4}
BuildRequires: %{python_module mock >= 1.0.1}
-BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module pytest >= 3.0.3}
BuildRequires: %{python_module pytest-cov >= 2.3.1}
-BuildRequires: %{python_module verboselogs}
-%endif
+BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module verboselogs >= 1.7}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
Requires: python-capturer >= 2.4
Requires: python-humanfriendly >= 3.2
-Recommends: python-verboselogs
-BuildArch: noarch
Requires(post): update-alternatives
Requires(postun): update-alternatives
-
+Recommends: python-verboselogs >= 1.7
+BuildArch: noarch
%python_subpackages
%description
@@ -73,15 +70,13 @@
%postun
%python_uninstall_alternative coloredlogs
-%if %{with test}
%check
-%python_exec setup.py test
-popd
-%endif
+# test_cli_conversion - requires coloredlogs binary available, we don't have
it at this point
+# test_auto_install - requires the install to the system to be actually
complete
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_version} coloredlogs/tests.py -v -k 'not (test_cli_conversion
or test_auto_install)'
%files %{python_files}
-%defattr(-,root,root,-)
-%doc README.rst
+%doc README.rst CHANGELOG.rst
%license LICENSE.txt
%python_alternative %{_bindir}/coloredlogs
%{python_sitelib}/coloredlogs/
++ coloredlogs-7.3.tar.gz -> coloredlogs-10.0.tar.gz ++
3859 lines of diff (skipped)
