[Python-modules-commits] [kitchen] 06/07: Updating d/patches to reflect new version.
Sergio Durigan Junior
sergiodj-guest at moszumanska.debian.org
Mon Aug 28 04:53:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
sergiodj-guest pushed a commit to branch master
in repository kitchen.
commit d49d6a20c3e76df3d4c9b871dbf6a0d454a7bdcb
Author: Sergio Durigan Junior <sergiodj at sergiodj.net>
Date: Mon Aug 28 00:44:53 2017 -0400
Updating d/patches to reflect new version.
---
debian/patches/fix_typos | 86 ++---
debian/patches/remove_compat_layers | 707 ++++++++++++++++++------------------
2 files changed, 389 insertions(+), 404 deletions(-)
diff --git a/debian/patches/fix_typos b/debian/patches/fix_typos
index 3e29fb6..28a0737 100644
--- a/debian/patches/fix_typos
+++ b/debian/patches/fix_typos
@@ -17,22 +17,22 @@ Patch-Name: fix_typos
releaseutils.py | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
-diff --git a/kitchen2/docs/api-pycompat27.rst b/kitchen2/docs/api-pycompat27.rst
-index 6ef6db1..9654b31 100644
---- a/kitchen2/docs/api-pycompat27.rst
-+++ b/kitchen2/docs/api-pycompat27.rst
-@@ -31,5 +31,5 @@ New API Feature Ver
+Index: kitchen/kitchen2/docs/api-pycompat27.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/api-pycompat27.rst 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/docs/api-pycompat27.rst 2017-08-28 00:40:52.316968791 -0400
+@@ -31,5 +31,5 @@
.. seealso::
- The stdlib :mod:`subprocess` documenation
+ The stdlib :mod:`subprocess` documentation
For complete documentation on how to use subprocess
-diff --git a/kitchen2/docs/designing-unicode-apis.rst b/kitchen2/docs/designing-unicode-apis.rst
-index 24265fb..5c909a9 100644
---- a/kitchen2/docs/designing-unicode-apis.rst
-+++ b/kitchen2/docs/designing-unicode-apis.rst
-@@ -581,7 +581,7 @@ you should consider when designing a :class:`unicode`-only API:
+Index: kitchen/kitchen2/docs/designing-unicode-apis.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/designing-unicode-apis.rst 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/docs/designing-unicode-apis.rst 2017-08-28 00:40:52.316968791 -0400
+@@ -581,7 +581,7 @@
that you may not have thought of. Corner cases in these other places may
mean that processing bytes is desirable.
2. In python2, byte :class:`str` and :class:`unicode` are often used
@@ -41,11 +41,11 @@ index 24265fb..5c909a9 100644
your API may have received :class:`str` from some other API and it would be
most convenient for their code if your API accepted it.
-diff --git a/kitchen2/docs/hacking.rst b/kitchen2/docs/hacking.rst
-index 530b7f2..5eb03c7 100644
---- a/kitchen2/docs/hacking.rst
-+++ b/kitchen2/docs/hacking.rst
-@@ -272,7 +272,7 @@ version.
+Index: kitchen/kitchen2/docs/hacking.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/hacking.rst 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/docs/hacking.rst 2017-08-28 00:40:52.316968791 -0400
+@@ -272,7 +272,7 @@
Criteria for subpackages in kitchen
===================================
@@ -54,11 +54,11 @@ index 530b7f2..5eb03c7 100644
* Generally useful or needed for other pieces of kitchen.
-diff --git a/kitchen2/docs/unicode-frustrations.rst b/kitchen2/docs/unicode-frustrations.rst
-index c46e797..5175104 100644
---- a/kitchen2/docs/unicode-frustrations.rst
-+++ b/kitchen2/docs/unicode-frustrations.rst
-@@ -33,7 +33,7 @@ In python-2.x, there's two types that deal with text.
+Index: kitchen/kitchen2/docs/unicode-frustrations.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/unicode-frustrations.rst 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/docs/unicode-frustrations.rst 2017-08-28 00:40:52.316968791 -0400
+@@ -33,7 +33,7 @@
with byte :class:`str` as those devices are going to need to deal with
concrete implementations of what bytes represent your abstract characters.
@@ -67,7 +67,7 @@ index c46e797..5175104 100644
are several important APIs where only one or the other will do the right
thing. When you give the wrong type of string to an API that wants the other
type, you may end up with an exception being raised (:exc:`UnicodeDecodeError`
-@@ -122,7 +122,7 @@ we're all set::
+@@ -122,7 +122,7 @@
So that was simple, right? Well... there's one gotcha that makes things a bit
harder to debug sometimes. When you attempt to write non-:term:`ASCII`
@@ -76,7 +76,7 @@ index c46e797..5175104 100644
But what happens when you use :func:`print`? The terminal is a file-like object
so it should raise an exception right? The answer to that is....
*sometimes*:
-@@ -539,7 +539,7 @@ a short example that uses many kitchen functions to do its work::
+@@ -539,7 +539,7 @@
# Note that we do not let implici type conversion from str to
# unicode transform b_filename into a unicode string. That might
# fail as python would use the ASCII filename. Instead we use
@@ -85,11 +85,11 @@ index c46e797..5175104 100644
# not traceback.
print _(u'filename: %s') % to_unicode(b_filename)
print _(u'file size: %s') % size
-diff --git a/kitchen2/kitchen/i18n/__init__.py b/kitchen2/kitchen/i18n/__init__.py
-index 80fe3ea..b694409 100644
---- a/kitchen2/kitchen/i18n/__init__.py
-+++ b/kitchen2/kitchen/i18n/__init__.py
-@@ -295,8 +295,8 @@ class DummyTranslations(object, gettext.NullTranslations):
+Index: kitchen/kitchen2/kitchen/i18n/__init__.py
+===================================================================
+--- kitchen.orig/kitchen2/kitchen/i18n/__init__.py 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/kitchen/i18n/__init__.py 2017-08-28 00:40:52.316968791 -0400
+@@ -295,8 +295,8 @@
def _reencode_if_necessary(self, message, output_encoding):
'''Return a byte string that's valid in a specific charset.
@@ -100,7 +100,7 @@ index 80fe3ea..b694409 100644
output encoding.
'''
valid = False
-@@ -721,7 +721,7 @@ def get_translation_object(domain, localedirs=tuple(), languages=None,
+@@ -721,7 +721,7 @@
objects by default. These are superior to the
:class:`gettext.GNUTranslations` and :class:`gettext.NullTranslations`
objects because they are consistent in the string type they return and
@@ -109,11 +109,11 @@ index 80fe3ea..b694409 100644
:exc:`UnicodeError`.
2. This function takes multiple directories to search for
:term:`message catalogs`.
-diff --git a/kitchen2/kitchen/pycompat25/collections/_defaultdict.py b/kitchen2/kitchen/pycompat25/collections/_defaultdict.py
-index 94ff7c2..d29c29c 100644
---- a/kitchen2/kitchen/pycompat25/collections/_defaultdict.py
-+++ b/kitchen2/kitchen/pycompat25/collections/_defaultdict.py
-@@ -73,7 +73,7 @@ the defaultdict class provided by python-2.5 and above.
+Index: kitchen/kitchen2/kitchen/pycompat25/collections/_defaultdict.py
+===================================================================
+--- kitchen.orig/kitchen2/kitchen/pycompat25/collections/_defaultdict.py 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/kitchen/pycompat25/collections/_defaultdict.py 2017-08-28 00:40:52.316968791 -0400
+@@ -73,7 +73,7 @@
# Pylint disabled messages
#
@@ -122,10 +122,10 @@ index 94ff7c2..d29c29c 100644
# the format of that name.
import types
-diff --git a/kitchen2/kitchen/text/display.py b/kitchen2/kitchen/text/display.py
-index 81234de..792878b 100644
---- a/kitchen2/kitchen/text/display.py
-+++ b/kitchen2/kitchen/text/display.py
+Index: kitchen/kitchen2/kitchen/text/display.py
+===================================================================
+--- kitchen.orig/kitchen2/kitchen/text/display.py 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/kitchen2/kitchen/text/display.py 2017-08-28 00:40:52.316968791 -0400
@@ -3,7 +3,7 @@
# Copyright (c) 2013 Red Hat, Inc.
# Copyright (c) 2010 Ville Skyttä
@@ -144,7 +144,7 @@ index 81234de..792878b 100644
# Toshio Kuratomi <toshio at fedoraproject.org>
# Tim Lauridsen
# Ville Skyttä
-@@ -211,7 +211,7 @@ def _generate_combining_table():
+@@ -225,7 +225,7 @@
This is used to generate the :data:`~kitchen.text.display._COMBINING`
table.
'''
@@ -153,11 +153,11 @@ index 81234de..792878b 100644
# characters generated ifrom Unicode 5.0 data by:
# "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c"
markus_kuhn_combining_5_0 = (
-diff --git a/releaseutils.py b/releaseutils.py
-index d2e64cf..828c071 100755
---- a/releaseutils.py
-+++ b/releaseutils.py
-@@ -47,7 +47,7 @@ def main():
+Index: kitchen/releaseutils.py
+===================================================================
+--- kitchen.orig/releaseutils.py 2017-08-28 00:40:52.320968774 -0400
++++ kitchen/releaseutils.py 2017-08-28 00:40:52.316968791 -0400
+@@ -47,7 +47,7 @@
shutil.rmtree('locale')
except OSError as e:
# If the error is that locale does not exist, we're okay. We're
diff --git a/debian/patches/remove_compat_layers b/debian/patches/remove_compat_layers
index 0d0cf5b..325c596 100644
--- a/debian/patches/remove_compat_layers
+++ b/debian/patches/remove_compat_layers
@@ -49,11 +49,11 @@ Patch-Name: remove_compat_layers
delete mode 100644 kitchen3/tests/test_deprecation_py3.py
delete mode 100644 kitchen3/tests/test_pycompat.py
-diff --git a/kitchen2/docs/api-overview.rst b/kitchen2/docs/api-overview.rst
-index dda56fe..e53a94d 100644
---- a/kitchen2/docs/api-overview.rst
-+++ b/kitchen2/docs/api-overview.rst
-@@ -16,9 +16,6 @@ that may drag in more dependencies can be found on the `project webpage`_
+Index: kitchen/kitchen2/docs/api-overview.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/api-overview.rst 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen2/docs/api-overview.rst 2017-08-28 00:47:21.485143105 -0400
+@@ -16,9 +16,6 @@
api-collections
api-iterutils
api-versioning
@@ -63,11 +63,10 @@ index dda56fe..e53a94d 100644
api-exceptions
.. _`project webpage`: https://fedorahosted.org/kitchen
-diff --git a/kitchen2/docs/api-pycompat24.rst b/kitchen2/docs/api-pycompat24.rst
-deleted file mode 100644
-index a3247b6..0000000
---- a/kitchen2/docs/api-pycompat24.rst
-+++ /dev/null
+Index: kitchen/kitchen2/docs/api-pycompat24.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/api-pycompat24.rst 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-=======================
-Python 2.4 Compatibiity
@@ -103,11 +102,10 @@ index a3247b6..0000000
- concentrate our efforts on keeping the single version of subprocess up
- to date rather than working on a 2.4 version that very few people
- would need specifically.
-diff --git a/kitchen2/docs/api-pycompat25.rst b/kitchen2/docs/api-pycompat25.rst
-deleted file mode 100644
-index 1841c6a..0000000
---- a/kitchen2/docs/api-pycompat25.rst
-+++ /dev/null
+Index: kitchen/kitchen2/docs/api-pycompat25.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/api-pycompat25.rst 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-========================
-Python 2.5 Compatibility
@@ -117,11 +115,10 @@ index 1841c6a..0000000
-
-.. automodule:: kitchen.pycompat25.collections._defaultdict
-
-diff --git a/kitchen2/docs/api-pycompat27.rst b/kitchen2/docs/api-pycompat27.rst
-deleted file mode 100644
-index 9654b31..0000000
---- a/kitchen2/docs/api-pycompat27.rst
-+++ /dev/null
+Index: kitchen/kitchen2/docs/api-pycompat27.rst
+===================================================================
+--- kitchen.orig/kitchen2/docs/api-pycompat27.rst 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-========================
-Python 2.7 Compatibility
@@ -158,11 +155,11 @@ index 9654b31..0000000
-
- The stdlib :mod:`subprocess` documentation
- For complete documentation on how to use subprocess
-diff --git a/kitchen2/kitchen/text/converters.py b/kitchen2/kitchen/text/converters.py
-index e4bcb0d..eb518cb 100644
---- a/kitchen2/kitchen/text/converters.py
-+++ b/kitchen2/kitchen/text/converters.py
-@@ -50,9 +50,6 @@ import codecs
+Index: kitchen/kitchen2/kitchen/text/converters.py
+===================================================================
+--- kitchen.orig/kitchen2/kitchen/text/converters.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen2/kitchen/text/converters.py 2017-08-28 00:47:21.485143105 -0400
+@@ -50,9 +50,6 @@
import warnings
import xml.sax.saxutils
@@ -172,11 +169,11 @@ index e4bcb0d..eb518cb 100644
from kitchen.text.exceptions import ControlCharError, XmlEncodeError
from kitchen.text.misc import guess_encoding, html_entities_unescape, \
isbytestring, isunicodestring, process_control_chars
-diff --git a/kitchen2/kitchen/text/misc.py b/kitchen2/kitchen/text/misc.py
-index 333e363..babb68e 100644
---- a/kitchen2/kitchen/text/misc.py
-+++ b/kitchen2/kitchen/text/misc.py
-@@ -43,11 +43,8 @@ try:
+Index: kitchen/kitchen2/kitchen/text/misc.py
+===================================================================
+--- kitchen.orig/kitchen2/kitchen/text/misc.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen2/kitchen/text/misc.py 2017-08-28 00:47:21.485143105 -0400
+@@ -43,11 +43,8 @@
except ImportError:
chardet = None
@@ -188,11 +185,10 @@ index 333e363..babb68e 100644
# Define a threshold for chardet confidence. If we fall below this we decode
# byte strings we're guessing about as latin1
_CHARDET_THRESHHOLD = 0.6
-diff --git a/kitchen2/tests/subprocessdata/sigchild_ignore.py b/kitchen2/tests/subprocessdata/sigchild_ignore.py
-deleted file mode 100644
-index 5b6dd08..0000000
---- a/kitchen2/tests/subprocessdata/sigchild_ignore.py
-+++ /dev/null
+Index: kitchen/kitchen2/tests/subprocessdata/sigchild_ignore.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/subprocessdata/sigchild_ignore.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-import os
-import signal, sys
@@ -205,11 +201,11 @@ index 5b6dd08..0000000
-# and causing us to exit with an error is what we are testing against.
-signal.signal(signal.SIGCHLD, signal.SIG_IGN)
-subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
-diff --git a/kitchen2/tests/test__all__.py b/kitchen2/tests/test__all__.py
-index dda287a..e08d699 100644
---- a/kitchen2/tests/test__all__.py
-+++ b/kitchen2/tests/test__all__.py
-@@ -4,8 +4,6 @@ from nose import tools
+Index: kitchen/kitchen2/tests/test__all__.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test__all__.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen2/tests/test__all__.py 2017-08-28 00:47:21.485143105 -0400
+@@ -4,8 +4,6 @@
import os
import types
import warnings
@@ -218,11 +214,10 @@ index dda287a..e08d699 100644
def logit(msg):
log = open('/var/tmp/test.log', 'a')
-diff --git a/kitchen2/tests/test_base64.py b/kitchen2/tests/test_base64.py
-deleted file mode 100644
-index 49e1cd1..0000000
---- a/kitchen2/tests/test_base64.py
-+++ /dev/null
+Index: kitchen/kitchen2/tests/test_base64.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test_base64.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-import unittest
-from kitchen.pycompat24.base64 import _base64 as base64
@@ -414,10 +409,10 @@ index 49e1cd1..0000000
-#
-#if __name__ == '__main__':
-# test_main()
-diff --git a/kitchen2/tests/test_collections.py b/kitchen2/tests/test_collections.py
-index 5e4dbd4..8765594 100644
---- a/kitchen2/tests/test_collections.py
-+++ b/kitchen2/tests/test_collections.py
+Index: kitchen/kitchen2/tests/test_collections.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test_collections.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen2/tests/test_collections.py 2017-08-28 00:47:21.485143105 -0400
@@ -3,9 +3,6 @@
import unittest
from nose import tools
@@ -428,11 +423,10 @@ index 5e4dbd4..8765594 100644
from kitchen import collections
def test_strict_dict_get_set():
-diff --git a/kitchen2/tests/test_defaultdict.py b/kitchen2/tests/test_defaultdict.py
-deleted file mode 100644
-index 5848d28..0000000
---- a/kitchen2/tests/test_defaultdict.py
-+++ /dev/null
+Index: kitchen/kitchen2/tests/test_defaultdict.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test_defaultdict.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-"""Unit tests for collections.defaultdict."""
-
@@ -614,11 +608,10 @@ index 5848d28..0000000
-#
-#if __name__ == "__main__":
-# test_main()
-diff --git a/kitchen2/tests/test_pycompat.py b/kitchen2/tests/test_pycompat.py
-deleted file mode 100644
-index 50a059b..0000000
---- a/kitchen2/tests/test_pycompat.py
-+++ /dev/null
+Index: kitchen/kitchen2/tests/test_pycompat.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test_pycompat.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-#
@@ -645,11 +638,10 @@ index 50a059b..0000000
- from kitchen.pycompat24.base64 import b64encode
- except ImportError:
- tools.ok_(False, 'Unable to import pycompat24.base64 as a module')
-diff --git a/kitchen2/tests/test_pycompat24.py b/kitchen2/tests/test_pycompat24.py
-deleted file mode 100644
-index adea7fe..0000000
---- a/kitchen2/tests/test_pycompat24.py
-+++ /dev/null
+Index: kitchen/kitchen2/tests/test_pycompat24.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test_pycompat24.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-#
@@ -760,11 +752,291 @@ index adea7fe..0000000
- raise SkipTest('Python-2.3 doesn\'t have b64encode to compare against')
- tools.ok_(base64.b64encode(self.b_byte_chars) == py_b64.b64encode(self.b_byte_chars))
- tools.ok_(base64.b64decode(self.b_byte_chars) == py_b64.b64decode(self.b_byte_chars))
-diff --git a/kitchen2/tests/test_subprocess.py b/kitchen2/tests/test_subprocess.py
-deleted file mode 100644
-index 010f660..0000000
---- a/kitchen2/tests/test_subprocess.py
-+++ /dev/null
+Index: kitchen/kitchen3/docs/api-overview.rst
+===================================================================
+--- kitchen.orig/kitchen3/docs/api-overview.rst 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen3/docs/api-overview.rst 2017-08-28 00:47:21.489143066 -0400
+@@ -16,9 +16,6 @@
+ api-collections
+ api-iterutils
+ api-versioning
+- api-pycompat24
+- api-pycompat25
+- api-pycompat27
+ api-exceptions
+
+ .. _`project webpage`: https://fedorahosted.org/kitchen
+Index: kitchen/kitchen3/docs/api-pycompat24.rst
+===================================================================
+--- kitchen.orig/kitchen3/docs/api-pycompat24.rst 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,34 +0,0 @@
+-=======================
+-Python 2.4 Compatibiity
+-=======================
+-
+-
+--------------------
+-Sets for python-2.3
+--------------------
+-
+-.. automodule:: kitchen.pycompat24.sets
+-.. autofunction:: kitchen.pycompat24.sets.add_builtin_set
+-
+-----------------------------------
+-Partial new style base64 interface
+-----------------------------------
+-
+-.. automodule:: kitchen.pycompat24.base64
+- :members:
+-
+-----------
+-Subprocess
+-----------
+-
+-.. seealso::
+-
+- :mod:`kitchen.pycompat27.subprocess`
+- Kitchen includes the python-2.7 version of subprocess which has a new
+- function, :func:`~kitchen.pycompat27.subprocess.check_output`. When
+- you import :mod:`pycompat24.subprocess` you will be getting the
+- python-2.7 version of subprocess rather than the 2.4 version (where
+- subprocess first appeared). This choice was made so that we can
+- concentrate our efforts on keeping the single version of subprocess up
+- to date rather than working on a 2.4 version that very few people
+- would need specifically.
+Index: kitchen/kitchen3/docs/api-pycompat25.rst
+===================================================================
+--- kitchen.orig/kitchen3/docs/api-pycompat25.rst 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,8 +0,0 @@
+-========================
+-Python 2.5 Compatibility
+-========================
+-
+-.. automodule:: kitchen.pycompat25
+-
+-.. automodule:: kitchen.pycompat25.collections.defaultdict
+-
+Index: kitchen/kitchen3/docs/api-pycompat27.rst
+===================================================================
+--- kitchen.orig/kitchen3/docs/api-pycompat27.rst 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,35 +0,0 @@
+-========================
+-Python 2.7 Compatibility
+-========================
+-
+-.. module:: kitchen.pycompat27.subprocess
+-
+---------------------------
+-Subprocess from Python 2.7
+---------------------------
+-
+-The :mod:`subprocess` module included here is a direct import from
+-python-2.7's |stdlib|_. You can access it via::
+-
+- >>> from kitchen.pycompat27 import subprocess
+-
+-The motivation for including this module is that various API changing
+-improvements have been made to subprocess over time. The following is a list
+-of the known changes to :mod:`subprocess` with the python version they were
+-introduced in:
+-
+-==================================== ===
+-New API Feature Ver
+-==================================== ===
+-:exc:`subprocess.CalledProcessError` 2.5
+-:func:`subprocess.check_call` 2.5
+-:func:`subprocess.check_output` 2.7
+-:meth:`subprocess.Popen.send_signal` 2.6
+-:meth:`subprocess.Popen.terminate` 2.6
+-:meth:`subprocess.Popen.kill` 2.6
+-==================================== ===
+-
+-.. seealso::
+-
+- The stdlib :mod:`subprocess` documenation
+- For complete documentation on how to use subprocess
+Index: kitchen/kitchen3/tests/subprocessdata/sigchild_ignore.py
+===================================================================
+--- kitchen.orig/kitchen3/tests/subprocessdata/sigchild_ignore.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,11 +0,0 @@
+-import os
+-import signal, sys
+-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
+-
+-from kitchen.pycompat27.subprocess import _subprocess as subprocess
+-
+-# On Linux this causes os.waitpid to fail with OSError as the OS has already
+-# reaped our child process. The wait() passing the OSError on to the caller
+-# and causing us to exit with an error is what we are testing against.
+-signal.signal(signal.SIGCHLD, signal.SIG_IGN)
+-subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
+Index: kitchen/kitchen3/tests/test__all__.py
+===================================================================
+--- kitchen.orig/kitchen3/tests/test__all__.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen3/tests/test__all__.py 2017-08-28 00:47:21.489143066 -0400
+@@ -4,8 +4,6 @@
+ import os
+ import types
+ import warnings
+-from kitchen.pycompat24.sets import add_builtin_set
+-add_builtin_set()
+
+ def logit(msg):
+ log = open('/var/tmp/test.log', 'a')
+Index: kitchen/kitchen3/tests/test_collections.py
+===================================================================
+--- kitchen.orig/kitchen3/tests/test_collections.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/kitchen3/tests/test_collections.py 2017-08-28 00:47:21.489143066 -0400
+@@ -3,9 +3,6 @@
+ import unittest
+ from nose import tools
+
+-from kitchen.pycompat24.sets import add_builtin_set
+-add_builtin_set()
+-
+ from kitchen import collections
+
+ def test_strict_dict_get_set():
+Index: kitchen/kitchen3/tests/test_deprecation_py3.py
+===================================================================
+--- kitchen.orig/kitchen3/tests/test_deprecation_py3.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,65 +0,0 @@
+-# -*- coding: utf-8 -*-
+-
+-from nose import tools
+-
+-import sys
+-import warnings
+-
+-import importlib
+-from kitchen.pycompat25.collections import defaultdict
+-
+-class TestPendingDeprecationModules(object):
+- def __init__(self):
+- kitchen_path = 'kitchen'
+- collections_path = 'kitchen/collections'
+- pycompat24_path = 'kitchen/pycompat24'
+- pycompat25_path = 'kitchen/pycompat25'
+- pycompat27_path = 'kitchen/pycompat27'
+-
+- self.module_data = (
+- ('strictdict', 'kitchen.collections.strictdict', collections_path),
+- ('pycompat24', 'kitchen.pycompat24', kitchen_path),
+- ('base64', 'kitchen.pycompat24.base64', pycompat24_path),
+- ('sets', 'kitchen.pycompat24.sets', pycompat24_path),
+- ('subprocess', 'kitchen.pycompat24.subprocess', pycompat24_path),
+- ('pycompat25', 'kitchen.pycompat25', kitchen_path),
+- ('collections', 'kitchen.pycompat25.collections', pycompat25_path),
+- ('pycompat27', 'kitchen.pycompat27', kitchen_path),
+- ('subprocess', 'kitchen.pycompat27.subprocess', pycompat27_path),
+- )
+-
+- def setUp(self):
+- for module in sys.modules.values():
+- if hasattr(module, '__warningregistry__'):
+- del module.__warningregistry__
+-
+- def check_modules(self, module_name, module_fqn, module_path):
+- with warnings.catch_warnings(record=True) as w:
+- warnings.simplefilter('always')
+- # imp.load_module will load even if it has already been loaded.
+- # We need to ensure that happens in order to trigger the
+- # deprecation warnings
+- importlib.find_loader(module_fqn, module_path).load_module()
+- warning_raised = False
+- for warning in (e.message for e in w):
+- if isinstance(warning, PendingDeprecationWarning) and \
+- ('%s is deprecated' % module_name) in warning.args[0]:
+- warning_raised = True
+- break
+- tools.assert_true(warning_raised, msg='%s did not raise a PendingDeprecationWarning' % module_fqn)
+-
+- def test_modules(self):
+- for mod in self.module_data:
+- yield self.check_modules, mod[0], mod[1], mod[2]
+-
+- def test_defaultdict(self):
+- with warnings.catch_warnings(record=True) as w:
+- warnings.simplefilter('always')
+- defaultdict()
+- warning_raised = False
+- for warning in (e.message for e in w):
+- if isinstance(warning, PendingDeprecationWarning) and \
+- ('defaultdict is deprecated') in warning.args[0]:
+- warning_raised = True
+- break
+- tools.assert_true(warning_raised, msg='kitchen.pycompat25.collections.defaultdict did not raise a PendingDeprecationWarning')
+Index: kitchen/kitchen3/tests/test_pycompat.py
+===================================================================
+--- kitchen.orig/kitchen3/tests/test_pycompat.py 2017-08-28 00:47:21.493143026 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,25 +0,0 @@
+-# -*- coding: utf-8 -*-
+-#
+-import unittest
+-from nose import tools
+-
+-class TestUsableModules(unittest.TestCase):
+- def test_subprocess(self):
+- '''Test that importing subprocess as a module works
+- '''
+- try:
+- from kitchen.pycompat24.subprocess import Popen
+- except ImportError:
+- tools.ok_(False, 'Unable to import pycompat24.subprocess as a module')
+- try:
+- from kitchen.pycompat27.subprocess import Popen
+- except ImportError:
+- tools.ok_(False, 'Unable to import pycompat27.subprocess as a module')
+-
+- def test_base64(self):
+- '''Test that importing base64 as a module works
+- '''
+- try:
+- from kitchen.pycompat24.base64 import b64encode
+- except ImportError:
+- tools.ok_(False, 'Unable to import pycompat24.base64 as a module')
+Index: kitchen/setup.py
+===================================================================
+--- kitchen.orig/setup.py 2017-08-28 00:47:21.493143026 -0400
++++ kitchen/setup.py 2017-08-28 00:47:21.489143066 -0400
+@@ -15,13 +15,6 @@
+ 'kitchen.iterutils',
+ 'kitchen.collections',
+ 'kitchen.text',
+- 'kitchen.pycompat24',
+- 'kitchen.pycompat24.base64',
+- 'kitchen.pycompat24.sets',
+- 'kitchen.pycompat25',
+- 'kitchen.pycompat25.collections',
+- 'kitchen.pycompat27',
+- 'kitchen.pycompat27.subprocess',
+ ]
+ elif sys.version_info[0] == 3:
+ source_dir = 'kitchen3'
+@@ -32,13 +25,6 @@
+ 'kitchen.iterutils',
+ 'kitchen.collections',
+ 'kitchen.text',
+- 'kitchen.pycompat24',
+- 'kitchen.pycompat24.base64',
+- 'kitchen.pycompat24.sets',
+- 'kitchen.pycompat25',
+- 'kitchen.pycompat25.collections',
+- 'kitchen.pycompat27',
+- 'kitchen.pycompat27.subprocess',
+ ]
+ else:
+ raise NotImplementedError("Python version unsupported %r" % sys.version)
+Index: kitchen/kitchen2/tests/test_subprocess.py
+===================================================================
+--- kitchen.orig/kitchen2/tests/test_subprocess.py 2017-08-28 00:41:05.800909917 -0400
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,1467 +0,0 @@
-import unittest
-from nose.plugins.skip import SkipTest
@@ -983,7 +1255,7 @@ index 010f660..0000000
- else:
- self.fail("Expected TypeError")
- finally:
-- setattr(sys,'stderr', orig_stderr)
+- setattr(sys, 'stderr', orig_stderr)
- self.assertEqual(s.getvalue(), '')
-
- def test_stdin_none(self):
@@ -1498,7 +1770,7 @@ index 010f660..0000000
- ofhandle, ofname = mkstemp()
- efhandle, efname = mkstemp()
- try:
-- subprocess.Popen (["*"], stdin=ifhandle, stdout=ofhandle,
+- subprocess.Popen(["*"], stdin=ifhandle, stdout=ofhandle,
- stderr=efhandle)
- except OSError:
- os.close(ifhandle)
@@ -1624,7 +1896,7 @@ index 010f660..0000000
- try:
- import resource
- old_limit = resource.getrlimit(resource.RLIMIT_CORE)
-- resource.setrlimit(resource.RLIMIT_CORE, (0,0))
+- resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
- return old_limit
- except (ImportError, ValueError, resource.error):
- return None
@@ -2180,7 +2452,7 @@ index 010f660..0000000
-
- super(CommandsWithSpaces, self).setUp()
- f, fname = mkstemp(".py", "te st")
-- self.fname = fname.lower ()
+- self.fname = fname.lower()
- os.write(f, "import sys;"
- "sys.stdout.write('%d %s' % (len(sys.argv), [a.lower () for a in sys.argv]))"
- )
@@ -2195,7 +2467,7 @@ index 010f660..0000000
- p = subprocess.Popen(*args, **kwargs)
- self.addCleanup(p.stdout.close)
- self.assertEqual(
-- p.stdout.read ().decode("mbcs"),
+- p.stdout.read().decode("mbcs"),
- "2 [%r, 'ab cd']" % self.fname
- )
-
@@ -2233,290 +2505,3 @@ index 010f660..0000000
-#
-#if __name__ == "__main__":
-# test_main()
-diff --git a/kitchen3/docs/api-overview.rst b/kitchen3/docs/api-overview.rst
-index dda56fe..e53a94d 100644
---- a/kitchen3/docs/api-overview.rst
-+++ b/kitchen3/docs/api-overview.rst
-@@ -16,9 +16,6 @@ that may drag in more dependencies can be found on the `project webpage`_
- api-collections
- api-iterutils
- api-versioning
-- api-pycompat24
-- api-pycompat25
-- api-pycompat27
- api-exceptions
-
- .. _`project webpage`: https://fedorahosted.org/kitchen
-diff --git a/kitchen3/docs/api-pycompat24.rst b/kitchen3/docs/api-pycompat24.rst
-deleted file mode 100644
-index a3247b6..0000000
---- a/kitchen3/docs/api-pycompat24.rst
-+++ /dev/null
-@@ -1,34 +0,0 @@
--=======================
--Python 2.4 Compatibiity
--=======================
--
--
---------------------
--Sets for python-2.3
---------------------
--
--.. automodule:: kitchen.pycompat24.sets
--.. autofunction:: kitchen.pycompat24.sets.add_builtin_set
--
------------------------------------
--Partial new style base64 interface
------------------------------------
--
--.. automodule:: kitchen.pycompat24.base64
-- :members:
--
------------
--Subprocess
------------
--
--.. seealso::
--
-- :mod:`kitchen.pycompat27.subprocess`
-- Kitchen includes the python-2.7 version of subprocess which has a new
-- function, :func:`~kitchen.pycompat27.subprocess.check_output`. When
-- you import :mod:`pycompat24.subprocess` you will be getting the
-- python-2.7 version of subprocess rather than the 2.4 version (where
-- subprocess first appeared). This choice was made so that we can
-- concentrate our efforts on keeping the single version of subprocess up
-- to date rather than working on a 2.4 version that very few people
-- would need specifically.
-diff --git a/kitchen3/docs/api-pycompat25.rst b/kitchen3/docs/api-pycompat25.rst
-deleted file mode 100644
-index 2323c2f..0000000
---- a/kitchen3/docs/api-pycompat25.rst
-+++ /dev/null
-@@ -1,8 +0,0 @@
--========================
--Python 2.5 Compatibility
--========================
--
--.. automodule:: kitchen.pycompat25
--
--.. automodule:: kitchen.pycompat25.collections.defaultdict
--
-diff --git a/kitchen3/docs/api-pycompat27.rst b/kitchen3/docs/api-pycompat27.rst
-deleted file mode 100644
-index 6ef6db1..0000000
---- a/kitchen3/docs/api-pycompat27.rst
-+++ /dev/null
-@@ -1,35 +0,0 @@
--========================
--Python 2.7 Compatibility
--========================
--
--.. module:: kitchen.pycompat27.subprocess
--
----------------------------
--Subprocess from Python 2.7
----------------------------
--
--The :mod:`subprocess` module included here is a direct import from
--python-2.7's |stdlib|_. You can access it via::
--
-- >>> from kitchen.pycompat27 import subprocess
--
--The motivation for including this module is that various API changing
--improvements have been made to subprocess over time. The following is a list
--of the known changes to :mod:`subprocess` with the python version they were
--introduced in:
--
--==================================== ===
--New API Feature Ver
--==================================== ===
--:exc:`subprocess.CalledProcessError` 2.5
--:func:`subprocess.check_call` 2.5
--:func:`subprocess.check_output` 2.7
--:meth:`subprocess.Popen.send_signal` 2.6
--:meth:`subprocess.Popen.terminate` 2.6
--:meth:`subprocess.Popen.kill` 2.6
--==================================== ===
--
--.. seealso::
--
-- The stdlib :mod:`subprocess` documenation
-- For complete documentation on how to use subprocess
-diff --git a/kitchen3/tests/subprocessdata/sigchild_ignore.py b/kitchen3/tests/subprocessdata/sigchild_ignore.py
-deleted file mode 100644
-index 5b6dd08..0000000
---- a/kitchen3/tests/subprocessdata/sigchild_ignore.py
-+++ /dev/null
-@@ -1,11 +0,0 @@
--import os
--import signal, sys
--sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
--
--from kitchen.pycompat27.subprocess import _subprocess as subprocess
--
--# On Linux this causes os.waitpid to fail with OSError as the OS has already
--# reaped our child process. The wait() passing the OSError on to the caller
--# and causing us to exit with an error is what we are testing against.
--signal.signal(signal.SIGCHLD, signal.SIG_IGN)
--subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
-diff --git a/kitchen3/tests/test__all__.py b/kitchen3/tests/test__all__.py
-index d25cb3f..7ceef8b 100644
---- a/kitchen3/tests/test__all__.py
-+++ b/kitchen3/tests/test__all__.py
-@@ -4,8 +4,6 @@ from nose import tools
- import os
- import types
- import warnings
--from kitchen.pycompat24.sets import add_builtin_set
--add_builtin_set()
-
- def logit(msg):
- log = open('/var/tmp/test.log', 'a')
-diff --git a/kitchen3/tests/test_collections.py b/kitchen3/tests/test_collections.py
-index e3da84b..12a6d04 100644
---- a/kitchen3/tests/test_collections.py
-+++ b/kitchen3/tests/test_collections.py
-@@ -3,9 +3,6 @@
- import unittest
- from nose import tools
-
--from kitchen.pycompat24.sets import add_builtin_set
--add_builtin_set()
--
- from kitchen import collections
-
- def test_strict_dict_get_set():
-diff --git a/kitchen3/tests/test_deprecation_py3.py b/kitchen3/tests/test_deprecation_py3.py
-deleted file mode 100644
-index f03c0df..0000000
---- a/kitchen3/tests/test_deprecation_py3.py
-+++ /dev/null
-@@ -1,65 +0,0 @@
--# -*- coding: utf-8 -*-
--
--from nose import tools
--
--import sys
--import warnings
--
--import importlib
--from kitchen.pycompat25.collections import defaultdict
--
--class TestPendingDeprecationModules(object):
-- def __init__(self):
-- kitchen_path = 'kitchen'
-- collections_path = 'kitchen/collections'
-- pycompat24_path = 'kitchen/pycompat24'
-- pycompat25_path = 'kitchen/pycompat25'
-- pycompat27_path = 'kitchen/pycompat27'
--
-- self.module_data = (
-- ('strictdict', 'kitchen.collections.strictdict', collections_path),
-- ('pycompat24', 'kitchen.pycompat24', kitchen_path),
-- ('base64', 'kitchen.pycompat24.base64', pycompat24_path),
-- ('sets', 'kitchen.pycompat24.sets', pycompat24_path),
-- ('subprocess', 'kitchen.pycompat24.subprocess', pycompat24_path),
-- ('pycompat25', 'kitchen.pycompat25', kitchen_path),
-- ('collections', 'kitchen.pycompat25.collections', pycompat25_path),
-- ('pycompat27', 'kitchen.pycompat27', kitchen_path),
-- ('subprocess', 'kitchen.pycompat27.subprocess', pycompat27_path),
-- )
--
-- def setUp(self):
-- for module in sys.modules.values():
-- if hasattr(module, '__warningregistry__'):
-- del module.__warningregistry__
--
-- def check_modules(self, module_name, module_fqn, module_path):
-- with warnings.catch_warnings(record=True) as w:
-- warnings.simplefilter('always')
-- # imp.load_module will load even if it has already been loaded.
-- # We need to ensure that happens in order to trigger the
-- # deprecation warnings
-- importlib.find_loader(module_fqn, module_path).load_module()
-- warning_raised = False
-- for warning in (e.message for e in w):
-- if isinstance(warning, PendingDeprecationWarning) and \
-- ('%s is deprecated' % module_name) in warning.args[0]:
-- warning_raised = True
-- break
-- tools.assert_true(warning_raised, msg='%s did not raise a PendingDeprecationWarning' % module_fqn)
--
-- def test_modules(self):
-- for mod in self.module_data:
-- yield self.check_modules, mod[0], mod[1], mod[2]
--
-- def test_defaultdict(self):
-- with warnings.catch_warnings(record=True) as w:
-- warnings.simplefilter('always')
-- defaultdict()
-- warning_raised = False
-- for warning in (e.message for e in w):
-- if isinstance(warning, PendingDeprecationWarning) and \
-- ('defaultdict is deprecated') in warning.args[0]:
-- warning_raised = True
-- break
-- tools.assert_true(warning_raised, msg='kitchen.pycompat25.collections.defaultdict did not raise a PendingDeprecationWarning')
-diff --git a/kitchen3/tests/test_pycompat.py b/kitchen3/tests/test_pycompat.py
-deleted file mode 100644
-index 50a059b..0000000
---- a/kitchen3/tests/test_pycompat.py
-+++ /dev/null
-@@ -1,25 +0,0 @@
--# -*- coding: utf-8 -*-
--#
--import unittest
--from nose import tools
--
--class TestUsableModules(unittest.TestCase):
-- def test_subprocess(self):
-- '''Test that importing subprocess as a module works
-- '''
-- try:
-- from kitchen.pycompat24.subprocess import Popen
-- except ImportError:
-- tools.ok_(False, 'Unable to import pycompat24.subprocess as a module')
-- try:
-- from kitchen.pycompat27.subprocess import Popen
-- except ImportError:
-- tools.ok_(False, 'Unable to import pycompat27.subprocess as a module')
--
-- def test_base64(self):
-- '''Test that importing base64 as a module works
-- '''
-- try:
-- from kitchen.pycompat24.base64 import b64encode
-- except ImportError:
-- tools.ok_(False, 'Unable to import pycompat24.base64 as a module')
-diff --git a/setup.py b/setup.py
... 31 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/kitchen.git
More information about the Python-modules-commits
mailing list