Remove the pycompat* submodules
Those are not needed in Debian as we already ship the latest runtime version. Forwarded: not-needed Last-Update: 2013-04-30 Patch-Name: remove_compat_layers
This commit is contained in:
Simon Chopin
parent
e99dd6fa94
commit
727e0eb7f3
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
========================
|
||||
Python 2.5 Compatibility
|
||||
========================
|
||||
|
||||
.. automodule:: kitchen.pycompat25
|
||||
|
||||
.. automodule:: kitchen.pycompat25.collections._defaultdict
|
||||
|
||||
|
|
@ -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` documentation
|
||||
For complete documentation on how to use subprocess
|
||||
|
|
@ -50,9 +50,6 @@ import codecs
|
|||
import warnings
|
||||
import xml.sax.saxutils
|
||||
|
||||
from kitchen.pycompat24 import sets
|
||||
sets.add_builtin_set()
|
||||
|
||||
from kitchen.text.exceptions import ControlCharError, XmlEncodeError
|
||||
from kitchen.text.misc import guess_encoding, html_entities_unescape, \
|
||||
isbytestring, isunicodestring, process_control_chars
|
||||
|
|
|
|||
|
|
@ -43,11 +43,8 @@ try:
|
|||
except ImportError:
|
||||
chardet = None
|
||||
|
||||
from kitchen.pycompat24 import sets
|
||||
from kitchen.text.exceptions import ControlCharError
|
||||
|
||||
sets.add_builtin_set()
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -1,190 +0,0 @@
|
|||
import unittest
|
||||
from kitchen.pycompat24.base64 import _base64 as base64
|
||||
|
||||
|
||||
|
||||
class LegacyBase64TestCase(unittest.TestCase):
|
||||
def test_encodestring(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.encodestring("www.python.org"), "d3d3LnB5dGhvbi5vcmc=\n")
|
||||
eq(base64.encodestring("a"), "YQ==\n")
|
||||
eq(base64.encodestring("ab"), "YWI=\n")
|
||||
eq(base64.encodestring("abc"), "YWJj\n")
|
||||
eq(base64.encodestring(""), "")
|
||||
eq(base64.encodestring("abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}"),
|
||||
"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n")
|
||||
|
||||
def test_decodestring(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.decodestring("d3d3LnB5dGhvbi5vcmc=\n"), "www.python.org")
|
||||
eq(base64.decodestring("YQ==\n"), "a")
|
||||
eq(base64.decodestring("YWI=\n"), "ab")
|
||||
eq(base64.decodestring("YWJj\n"), "abc")
|
||||
eq(base64.decodestring("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n"),
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}")
|
||||
eq(base64.decodestring(''), '')
|
||||
|
||||
def test_encode(self):
|
||||
eq = self.assertEqual
|
||||
from cStringIO import StringIO
|
||||
infp = StringIO('abcdefghijklmnopqrstuvwxyz'
|
||||
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||
'0123456789!@#0^&*();:<>,. []{}')
|
||||
outfp = StringIO()
|
||||
base64.encode(infp, outfp)
|
||||
eq(outfp.getvalue(),
|
||||
'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE'
|
||||
'RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT'
|
||||
'Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n')
|
||||
|
||||
def test_decode(self):
|
||||
from cStringIO import StringIO
|
||||
infp = StringIO('d3d3LnB5dGhvbi5vcmc=')
|
||||
outfp = StringIO()
|
||||
base64.decode(infp, outfp)
|
||||
self.assertEqual(outfp.getvalue(), 'www.python.org')
|
||||
|
||||
|
||||
|
||||
class BaseXYTestCase(unittest.TestCase):
|
||||
def test_b64encode(self):
|
||||
eq = self.assertEqual
|
||||
# Test default alphabet
|
||||
eq(base64.b64encode("www.python.org"), "d3d3LnB5dGhvbi5vcmc=")
|
||||
eq(base64.b64encode('\x00'), 'AA==')
|
||||
eq(base64.b64encode("a"), "YQ==")
|
||||
eq(base64.b64encode("ab"), "YWI=")
|
||||
eq(base64.b64encode("abc"), "YWJj")
|
||||
eq(base64.b64encode(""), "")
|
||||
eq(base64.b64encode("abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}"),
|
||||
"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==")
|
||||
# Test with arbitrary alternative characters
|
||||
eq(base64.b64encode('\xd3V\xbeo\xf7\x1d', altchars='*$'), '01a*b$cd')
|
||||
# Test standard alphabet
|
||||
eq(base64.standard_b64encode("www.python.org"), "d3d3LnB5dGhvbi5vcmc=")
|
||||
eq(base64.standard_b64encode("a"), "YQ==")
|
||||
eq(base64.standard_b64encode("ab"), "YWI=")
|
||||
eq(base64.standard_b64encode("abc"), "YWJj")
|
||||
eq(base64.standard_b64encode(""), "")
|
||||
eq(base64.standard_b64encode("abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}"),
|
||||
"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==")
|
||||
# Test with 'URL safe' alternative characters
|
||||
eq(base64.urlsafe_b64encode('\xd3V\xbeo\xf7\x1d'), '01a-b_cd')
|
||||
|
||||
def test_b64decode(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.b64decode("d3d3LnB5dGhvbi5vcmc="), "www.python.org")
|
||||
eq(base64.b64decode('AA=='), '\x00')
|
||||
eq(base64.b64decode("YQ=="), "a")
|
||||
eq(base64.b64decode("YWI="), "ab")
|
||||
eq(base64.b64decode("YWJj"), "abc")
|
||||
eq(base64.b64decode("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ=="),
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}")
|
||||
eq(base64.b64decode(''), '')
|
||||
# Test with arbitrary alternative characters
|
||||
eq(base64.b64decode('01a*b$cd', altchars='*$'), '\xd3V\xbeo\xf7\x1d')
|
||||
# Test standard alphabet
|
||||
eq(base64.standard_b64decode("d3d3LnB5dGhvbi5vcmc="), "www.python.org")
|
||||
eq(base64.standard_b64decode("YQ=="), "a")
|
||||
eq(base64.standard_b64decode("YWI="), "ab")
|
||||
eq(base64.standard_b64decode("YWJj"), "abc")
|
||||
eq(base64.standard_b64decode(""), "")
|
||||
eq(base64.standard_b64decode("YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
|
||||
"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NT"
|
||||
"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ=="),
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"0123456789!@#0^&*();:<>,. []{}")
|
||||
# Test with 'URL safe' alternative characters
|
||||
eq(base64.urlsafe_b64decode('01a-b_cd'), '\xd3V\xbeo\xf7\x1d')
|
||||
|
||||
def test_b64decode_error(self):
|
||||
self.assertRaises(TypeError, base64.b64decode, 'abc')
|
||||
|
||||
def test_b32encode(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.b32encode(''), '')
|
||||
eq(base64.b32encode('\x00'), 'AA======')
|
||||
eq(base64.b32encode('a'), 'ME======')
|
||||
eq(base64.b32encode('ab'), 'MFRA====')
|
||||
eq(base64.b32encode('abc'), 'MFRGG===')
|
||||
eq(base64.b32encode('abcd'), 'MFRGGZA=')
|
||||
eq(base64.b32encode('abcde'), 'MFRGGZDF')
|
||||
|
||||
def test_b32decode(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.b32decode(''), '')
|
||||
eq(base64.b32decode('AA======'), '\x00')
|
||||
eq(base64.b32decode('ME======'), 'a')
|
||||
eq(base64.b32decode('MFRA===='), 'ab')
|
||||
eq(base64.b32decode('MFRGG==='), 'abc')
|
||||
eq(base64.b32decode('MFRGGZA='), 'abcd')
|
||||
eq(base64.b32decode('MFRGGZDF'), 'abcde')
|
||||
|
||||
def test_b32decode_casefold(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.b32decode('', True), '')
|
||||
eq(base64.b32decode('ME======', True), 'a')
|
||||
eq(base64.b32decode('MFRA====', True), 'ab')
|
||||
eq(base64.b32decode('MFRGG===', True), 'abc')
|
||||
eq(base64.b32decode('MFRGGZA=', True), 'abcd')
|
||||
eq(base64.b32decode('MFRGGZDF', True), 'abcde')
|
||||
# Lower cases
|
||||
eq(base64.b32decode('me======', True), 'a')
|
||||
eq(base64.b32decode('mfra====', True), 'ab')
|
||||
eq(base64.b32decode('mfrgg===', True), 'abc')
|
||||
eq(base64.b32decode('mfrggza=', True), 'abcd')
|
||||
eq(base64.b32decode('mfrggzdf', True), 'abcde')
|
||||
# Expected exceptions
|
||||
self.assertRaises(TypeError, base64.b32decode, 'me======')
|
||||
# Mapping zero and one
|
||||
eq(base64.b32decode('MLO23456'), 'b\xdd\xad\xf3\xbe')
|
||||
eq(base64.b32decode('M1023456', map01='L'), 'b\xdd\xad\xf3\xbe')
|
||||
eq(base64.b32decode('M1023456', map01='I'), 'b\x1d\xad\xf3\xbe')
|
||||
|
||||
def test_b32decode_error(self):
|
||||
self.assertRaises(TypeError, base64.b32decode, 'abc')
|
||||
self.assertRaises(TypeError, base64.b32decode, 'ABCDEF==')
|
||||
|
||||
def test_b16encode(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.b16encode('\x01\x02\xab\xcd\xef'), '0102ABCDEF')
|
||||
eq(base64.b16encode('\x00'), '00')
|
||||
|
||||
def test_b16decode(self):
|
||||
eq = self.assertEqual
|
||||
eq(base64.b16decode('0102ABCDEF'), '\x01\x02\xab\xcd\xef')
|
||||
eq(base64.b16decode('00'), '\x00')
|
||||
# Lower case is not allowed without a flag
|
||||
self.assertRaises(TypeError, base64.b16decode, '0102abcdef')
|
||||
# Case fold
|
||||
eq(base64.b16decode('0102abcdef', True), '\x01\x02\xab\xcd\xef')
|
||||
|
||||
|
||||
|
||||
#from test import test_support
|
||||
#def test_main():
|
||||
# test_support.run_unittest(__name__)
|
||||
#
|
||||
#if __name__ == '__main__':
|
||||
# test_main()
|
||||
|
|
@ -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():
|
||||
|
|
|
|||
|
|
@ -1,180 +0,0 @@
|
|||
"""Unit tests for collections.defaultdict."""
|
||||
|
||||
import os
|
||||
import copy
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
from kitchen.pycompat25.collections._defaultdict import defaultdict
|
||||
|
||||
def foobar():
|
||||
return list
|
||||
|
||||
class TestDefaultDict(unittest.TestCase):
|
||||
|
||||
def test_basic(self):
|
||||
d1 = defaultdict()
|
||||
self.assertEqual(d1.default_factory, None)
|
||||
d1.default_factory = list
|
||||
d1[12].append(42)
|
||||
self.assertEqual(d1, {12: [42]})
|
||||
d1[12].append(24)
|
||||
self.assertEqual(d1, {12: [42, 24]})
|
||||
d1[13]
|
||||
d1[14]
|
||||
self.assertEqual(d1, {12: [42, 24], 13: [], 14: []})
|
||||
self.assert_(d1[12] is not d1[13] is not d1[14])
|
||||
d2 = defaultdict(list, foo=1, bar=2)
|
||||
self.assertEqual(d2.default_factory, list)
|
||||
self.assertEqual(d2, {"foo": 1, "bar": 2})
|
||||
self.assertEqual(d2["foo"], 1)
|
||||
self.assertEqual(d2["bar"], 2)
|
||||
self.assertEqual(d2[42], [])
|
||||
self.assert_("foo" in d2)
|
||||
self.assert_("foo" in d2.keys())
|
||||
self.assert_("bar" in d2)
|
||||
self.assert_("bar" in d2.keys())
|
||||
self.assert_(42 in d2)
|
||||
self.assert_(42 in d2.keys())
|
||||
self.assert_(12 not in d2)
|
||||
self.assert_(12 not in d2.keys())
|
||||
d2.default_factory = None
|
||||
self.assertEqual(d2.default_factory, None)
|
||||
try:
|
||||
d2[15]
|
||||
except KeyError, err:
|
||||
self.assertEqual(err.args, (15,))
|
||||
else:
|
||||
self.fail("d2[15] didn't raise KeyError")
|
||||
self.assertRaises(TypeError, defaultdict, 1)
|
||||
|
||||
def test_missing(self):
|
||||
d1 = defaultdict()
|
||||
self.assertRaises(KeyError, d1.__missing__, 42)
|
||||
d1.default_factory = list
|
||||
self.assertEqual(d1.__missing__(42), [])
|
||||
|
||||
def test_repr(self):
|
||||
d1 = defaultdict()
|
||||
self.assertEqual(d1.default_factory, None)
|
||||
self.assertEqual(repr(d1), "defaultdict(None, {})")
|
||||
self.assertEqual(eval(repr(d1)), d1)
|
||||
d1[11] = 41
|
||||
self.assertEqual(repr(d1), "defaultdict(None, {11: 41})")
|
||||
d2 = defaultdict(int)
|
||||
self.assertEqual(d2.default_factory, int)
|
||||
d2[12] = 42
|
||||
self.assertEqual(repr(d2), "defaultdict(<type 'int'>, {12: 42})")
|
||||
def foo(): return 43
|
||||
d3 = defaultdict(foo)
|
||||
|
||||
self.assert_(d3.default_factory is foo)
|
||||
d3[13]
|
||||
self.assertEqual(repr(d3), "defaultdict(%s, {13: 43})" % repr(foo))
|
||||
|
||||
def test_print(self):
|
||||
d1 = defaultdict()
|
||||
def foo(): return 42
|
||||
d2 = defaultdict(foo, {1: 2})
|
||||
# NOTE: We can't use tempfile.[Named]TemporaryFile since this
|
||||
# code must exercise the tp_print C code, which only gets
|
||||
# invoked for *real* files.
|
||||
tfn = tempfile.mktemp()
|
||||
try:
|
||||
f = open(tfn, "w+")
|
||||
try:
|
||||
print >>f, d1
|
||||
print >>f, d2
|
||||
f.seek(0)
|
||||
self.assertEqual(f.readline(), repr(d1) + "\n")
|
||||
self.assertEqual(f.readline(), repr(d2) + "\n")
|
||||
finally:
|
||||
f.close()
|
||||
finally:
|
||||
os.remove(tfn)
|
||||
|
||||
def test_copy(self):
|
||||
d1 = defaultdict()
|
||||
d2 = d1.copy()
|
||||
self.assertEqual(type(d2), defaultdict)
|
||||
self.assertEqual(d2.default_factory, None)
|
||||
self.assertEqual(d2, {})
|
||||
d1.default_factory = list
|
||||
d3 = d1.copy()
|
||||
self.assertEqual(type(d3), defaultdict)
|
||||
self.assertEqual(d3.default_factory, list)
|
||||
self.assertEqual(d3, {})
|
||||
d1[42]
|
||||
d4 = d1.copy()
|
||||
self.assertEqual(type(d4), defaultdict)
|
||||
self.assertEqual(d4.default_factory, list)
|
||||
self.assertEqual(d4, {42: []})
|
||||
d4[12]
|
||||
self.assertEqual(d4, {42: [], 12: []})
|
||||
|
||||
# Issue 6637: Copy fails for empty default dict
|
||||
d = defaultdict()
|
||||
d['a'] = 42
|
||||
e = d.copy()
|
||||
self.assertEqual(e['a'], 42)
|
||||
|
||||
def test_shallow_copy(self):
|
||||
d1 = defaultdict(foobar, {1: 1})
|
||||
d2 = copy.copy(d1)
|
||||
self.assertEqual(d2.default_factory, foobar)
|
||||
self.assertEqual(d2, d1)
|
||||
d1.default_factory = list
|
||||
d2 = copy.copy(d1)
|
||||
self.assertEqual(d2.default_factory, list)
|
||||
self.assertEqual(d2, d1)
|
||||
|
||||
def test_deep_copy(self):
|
||||
d1 = defaultdict(foobar, {1: [1]})
|
||||
d2 = copy.deepcopy(d1)
|
||||
self.assertEqual(d2.default_factory, foobar)
|
||||
self.assertEqual(d2, d1)
|
||||
self.assert_(d1[1] is not d2[1])
|
||||
d1.default_factory = list
|
||||
d2 = copy.deepcopy(d1)
|
||||
self.assertEqual(d2.default_factory, list)
|
||||
self.assertEqual(d2, d1)
|
||||
|
||||
def test_keyerror_without_factory(self):
|
||||
d1 = defaultdict()
|
||||
try:
|
||||
d1[(1,)]
|
||||
except KeyError, err:
|
||||
self.assertEqual(err.args[0], (1,))
|
||||
else:
|
||||
self.fail("expected KeyError")
|
||||
|
||||
def test_recursive_repr(self):
|
||||
# Issue2045: stack overflow when default_factory is a bound method
|
||||
class sub(defaultdict):
|
||||
def __init__(self):
|
||||
self.default_factory = self._factory
|
||||
def _factory(self):
|
||||
return []
|
||||
d = sub()
|
||||
self.assert_(repr(d).startswith(
|
||||
"defaultdict(<bound method sub._factory of defaultdict(..."))
|
||||
|
||||
# NOTE: printing a subclass of a builtin type does not call its
|
||||
# tp_print slot. So this part is essentially the same test as above.
|
||||
tfn = tempfile.mktemp()
|
||||
try:
|
||||
f = open(tfn, "w+")
|
||||
try:
|
||||
print >>f, d
|
||||
finally:
|
||||
f.close()
|
||||
finally:
|
||||
os.remove(tfn)
|
||||
|
||||
|
||||
#from test import test_support
|
||||
#def test_main():
|
||||
# test_support.run_unittest(TestDefaultDict)
|
||||
#
|
||||
#if __name__ == "__main__":
|
||||
# test_main()
|
||||
|
|
@ -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')
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
import unittest
|
||||
from nose import tools
|
||||
from nose.plugins.skip import SkipTest
|
||||
|
||||
import __builtin__
|
||||
import base64 as py_b64
|
||||
import warnings
|
||||
|
||||
from kitchen.pycompat24 import sets
|
||||
from kitchen.pycompat24.base64 import _base64 as base64
|
||||
|
||||
class TestSetsNoOverwrite(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.set_val = None
|
||||
self.frozenset_val = None
|
||||
if not hasattr(__builtin__, 'set'):
|
||||
__builtin__.set = self.set_val
|
||||
else:
|
||||
self.set_val = __builtin__.set
|
||||
if not hasattr(__builtin__, 'frozenset'):
|
||||
__builtin__.frozenset = self.frozenset_val
|
||||
else:
|
||||
self.frozenset_val = __builtin__.frozenset
|
||||
|
||||
def tearDown(self):
|
||||
if self.frozenset_val == None:
|
||||
del(__builtin__.frozenset)
|
||||
if self.set_val == None:
|
||||
del(__builtin__.set)
|
||||
|
||||
def test_sets_dont_overwrite(self):
|
||||
'''Test that importing sets when there's already a set and frozenset defined does not overwrite
|
||||
'''
|
||||
sets.add_builtin_set()
|
||||
tools.ok_(__builtin__.set == self.set_val)
|
||||
tools.ok_(__builtin__.frozenset == self.frozenset_val)
|
||||
|
||||
class TestDefineSets(unittest.TestCase):
|
||||
def setUp(self):
|
||||
warnings.simplefilter('ignore', DeprecationWarning)
|
||||
self.set_val = None
|
||||
self.frozenset_val = None
|
||||
if hasattr(__builtin__, 'set'):
|
||||
self.set_val = __builtin__.set
|
||||
del(__builtin__.set)
|
||||
if hasattr(__builtin__, 'frozenset'):
|
||||
self.frozenset_val = __builtin__.frozenset
|
||||
del(__builtin__.frozenset)
|
||||
|
||||
def tearDown(self):
|
||||
warnings.simplefilter('default', DeprecationWarning)
|
||||
if self.set_val:
|
||||
__builtin__.set = self.set_val
|
||||
else:
|
||||
del(__builtin__.set)
|
||||
if self.frozenset_val:
|
||||
__builtin__.frozenset = self.frozenset_val
|
||||
else:
|
||||
del(__builtin__.frozenset)
|
||||
|
||||
def test_pycompat_defines_set(self):
|
||||
'''Test that calling pycompat24.add_builtin_set() adds set and frozenset to __builtin__
|
||||
'''
|
||||
import sets as py_sets
|
||||
sets.add_builtin_set()
|
||||
if self.set_val:
|
||||
tools.ok_(__builtin__.set == self.set_val)
|
||||
tools.ok_(__builtin__.frozenset == self.frozenset_val)
|
||||
else:
|
||||
tools.ok_(__builtin__.set == py_sets.Set)
|
||||
tools.ok_(__builtin__.frozenset == py_sets.ImmutableSet)
|
||||
|
||||
class TestSubprocess(unittest.TestCase):
|
||||
pass
|
||||
|
||||
class TestBase64(unittest.TestCase):
|
||||
b_byte_chars = ' '.join(map(chr, range(0, 256)))
|
||||
b_byte_encoded = 'ACABIAIgAyAEIAUgBiAHIAggCSAKIAsgDCANIA4gDyAQIBEgEiATIBQgFSAWIBcgGCAZIBogGyAcIB0gHiAfICAgISAiICMgJCAlICYgJyAoICkgKiArICwgLSAuIC8gMCAxIDIgMyA0IDUgNiA3IDggOSA6IDsgPCA9ID4gPyBAIEEgQiBDIEQgRSBGIEcgSCBJIEogSyBMIE0gTiBPIFAgUSBSIFMgVCBVIFYgVyBYIFkgWiBbIFwgXSBeIF8gYCBhIGIgYyBkIGUgZiBnIGggaSBqIGsgbCBtIG4gbyBwIHEgciBzIHQgdSB2IHcgeCB5IHogeyB8IH0gfiB/IIAggSCCIIMghCCFIIYghyCIIIkgiiCLIIwgjSCOII8gkCCRIJIgkyCUIJUgliCXIJggmSCaIJsgnCCdIJ4gnyCgIKEgoiCjIKQgpSCmIKcgqCCpIKogqyCsIK0griCvILAgsSCyILMgtCC1ILYgtyC4ILkguiC7ILwgvSC+IL8gwCDBIMIgwyDEIMUgxiDHIMggySDKIMsgzCDNIM4gzyDQINEg0iDTINQg1SDWINcg2CDZINog2yDcIN0g3iDfIOAg4SDiIOMg5CDlIOYg5yDoIOkg6iDrIOwg7SDuIO8g8CDxIPIg8yD0IPUg9iD3IPgg+SD6IPsg/CD9IP4g/w=='
|
||||
b_byte_encoded_urlsafe = 'ACABIAIgAyAEIAUgBiAHIAggCSAKIAsgDCANIA4gDyAQIBEgEiATIBQgFSAWIBcgGCAZIBogGyAcIB0gHiAfICAgISAiICMgJCAlICYgJyAoICkgKiArICwgLSAuIC8gMCAxIDIgMyA0IDUgNiA3IDggOSA6IDsgPCA9ID4gPyBAIEEgQiBDIEQgRSBGIEcgSCBJIEogSyBMIE0gTiBPIFAgUSBSIFMgVCBVIFYgVyBYIFkgWiBbIFwgXSBeIF8gYCBhIGIgYyBkIGUgZiBnIGggaSBqIGsgbCBtIG4gbyBwIHEgciBzIHQgdSB2IHcgeCB5IHogeyB8IH0gfiB_IIAggSCCIIMghCCFIIYghyCIIIkgiiCLIIwgjSCOII8gkCCRIJIgkyCUIJUgliCXIJggmSCaIJsgnCCdIJ4gnyCgIKEgoiCjIKQgpSCmIKcgqCCpIKogqyCsIK0griCvILAgsSCyILMgtCC1ILYgtyC4ILkguiC7ILwgvSC-IL8gwCDBIMIgwyDEIMUgxiDHIMggySDKIMsgzCDNIM4gzyDQINEg0iDTINQg1SDWINcg2CDZINog2yDcIN0g3iDfIOAg4SDiIOMg5CDlIOYg5yDoIOkg6iDrIOwg7SDuIO8g8CDxIPIg8yD0IPUg9iD3IPgg-SD6IPsg_CD9IP4g_w=='
|
||||
|
||||
def test_base64_encode(self):
|
||||
tools.ok_(base64.b64encode(self.b_byte_chars) == self.b_byte_encoded)
|
||||
tools.ok_(base64.b64encode(self.b_byte_chars, altchars='-_') == self.b_byte_encoded_urlsafe)
|
||||
tools.ok_(base64.standard_b64encode(self.b_byte_chars) == self.b_byte_encoded)
|
||||
tools.ok_(base64.urlsafe_b64encode(self.b_byte_chars) == self.b_byte_encoded_urlsafe)
|
||||
|
||||
tools.ok_(base64.b64encode(self.b_byte_chars) == self.b_byte_encoded)
|
||||
tools.ok_(base64.b64encode(self.b_byte_chars, altchars='-_') == self.b_byte_encoded_urlsafe)
|
||||
tools.ok_(base64.standard_b64encode(self.b_byte_chars) == self.b_byte_encoded)
|
||||
tools.ok_(base64.urlsafe_b64encode(self.b_byte_chars) == self.b_byte_encoded_urlsafe)
|
||||
|
||||
def test_base64_decode(self):
|
||||
tools.ok_(base64.b64decode(self.b_byte_encoded) == self.b_byte_chars)
|
||||
tools.ok_(base64.b64decode(self.b_byte_encoded_urlsafe, altchars='-_') == self.b_byte_chars)
|
||||
tools.ok_(base64.standard_b64decode(self.b_byte_encoded) == self.b_byte_chars)
|
||||
tools.ok_(base64.urlsafe_b64decode(self.b_byte_encoded_urlsafe) == self.b_byte_chars)
|
||||
|
||||
tools.ok_(base64.b64decode(self.b_byte_encoded) == self.b_byte_chars)
|
||||
tools.ok_(base64.b64decode(self.b_byte_encoded_urlsafe, altchars='-_') == self.b_byte_chars)
|
||||
tools.ok_(base64.standard_b64decode(self.b_byte_encoded) == self.b_byte_chars)
|
||||
tools.ok_(base64.urlsafe_b64decode(self.b_byte_encoded_urlsafe) == self.b_byte_chars)
|
||||
|
||||
def test_base64_stdlib_compat(self):
|
||||
if not hasattr(py_b64, 'b64encode'):
|
||||
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))
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
========================
|
||||
Python 2.5 Compatibility
|
||||
========================
|
||||
|
||||
.. automodule:: kitchen.pycompat25
|
||||
|
||||
.. automodule:: kitchen.pycompat25.collections.defaultdict
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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()
|
||||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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():
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
@ -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')
|
||||
14
setup.py
14
setup.py
|
|
@ -15,13 +15,6 @@ if sys.version_info[0] == 2:
|
|||
'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 @@ elif sys.version_info[0] == 3:
|
|||
'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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue