upstream/oracle/userland-gate: components/python/pybonjour/patches/pybonjour-python3.patch@8f76366ca895 (annotated)

5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	1	This patch is mainly for Python 3 compatibility. It has not been submitted
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	2	upstream, as the community appears to have gone dormant.
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	3
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	4	test_enumerate_domains failed due to an unclear reason. Given it's not used by
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	5	the consumer, skip it for now.
1907 446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	6
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	7	--- pybonjour-1.1.1/pybonjour.py-orig 2013-02-13 04:39:03.391680773 -0600
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	8	+++ pybonjour-1.1.1/pybonjour.py 2013-02-13 04:39:15.452208372 -0600
5341 acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	9	@@ -63,1 +63,4 @@
5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	10	+if sys.version_info >= (3, 0):
5341 acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	11	+ unicode = str
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	12	+ basestring = str
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	13
1907 446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	14	@@ -804,7 +804,7 @@ def _create_function_bindings():
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	15	}
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	16
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	17
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	18	- for name, (restype, errcheck, outparam, argtypes) in specs.iteritems():
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	19	+ for name, (restype, errcheck, outparam, argtypes) in specs.items():
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	20	prototype = _CFunc(restype, *argtypes)
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	21
446472de62e9 PSARC 2014/151 Python 3.4 John Beck <John.Beck@Oracle.COM> parents: diff changeset	22	paramflags = [1] * len(argtypes)
5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	23	@@ -848,14 +848,20 @@
5341 acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	24
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	25	def _string_to_length_and_void_p(string):
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	26	if isinstance(string, TXTRecord):
5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	27	string = str(string)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	28	+ # ctypes.c_char_p requires bytes
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	29	+ if sys.version_info >= (3, 0) and isinstance(string, str):
5341 acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	30	+ string = string.encode('utf-8')
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	31	void_p = ctypes.cast(ctypes.c_char_p(string), ctypes.c_void_p)
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	32	return len(string), void_p
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	33
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	34
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	35	def _length_and_void_p_to_string(length, void_p):
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	36	char_p = ctypes.cast(void_p, ctypes.POINTER(ctypes.c_char))
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	37	- return ''.join(char_p[i] for i in xrange(length))
5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	38	+ string = b''.join(char_p[i] for i in range(length))
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	39	+ if sys.version_info < (3, 0):
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	40	+ return string
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	41	+ return string.decode('utf-8')
5341 acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	42
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	43
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	44
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	45	@@ -1942,7 +1942,7 @@ def __init__(self, items={}, strict=True):
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	46	self._names = []
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	47	self._items = {}
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	48
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	49	- for name, value in items.iteritems():
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	50	+ for name, value in items.items():
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	51	self[name] = value
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	52
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	53	def __contains__(self, name):
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	54	@@ -2023,8 +2023,8 @@ def __setitem__(self, name, value):
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	55
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	56	if value is not None:
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	57	- if isinstance(value, unicode):
5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	58	+ if sys.version_info < (3, 0) and isinstance(value, unicode):
5341 acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	59	value = value.encode('utf-8')
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	60	else:
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	61	value = str(value)
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	62	length += 1 + len(value)
acafdc8d7dfc 22494009 Python 3 fixes for pybonjour Yiteng Zhang <yiteng.zhang@oracle.com> parents: 1907 diff changeset	63
5457 8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	64	--- pybonjour-1.1.1/test_pybonjour.py 2013-02-13 04:39:03.391680773 -0600
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	65	+++ pybonjour-1.1.1/test_pybonjour.py 2013-02-13 04:39:15.452208372 -0600
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	66	@@ -1,1 +1,2 @@
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	67	-################################################################################
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	68	+# -- coding: utf-8 --
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	69	+################################################################################
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	70	@@ -67,3 +67,4 @@
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	71	DNSServiceProcessResult(sdRef)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	72
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	73	+ @unittest.skip("skipping")
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	74	def test_enumerate_domains(self):
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	75	@@ -206,3 +206,7 @@ def test_addrecord_updaterecord_removerecord(self):
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	76	self.query_record(kDNSServiceType_SINK, 'bar')
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	77	+
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	78	+ # test UTF-8 unicode characters
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	79	+ DNSServiceUpdateRecord(sdRef, RecordRef, rdata='ʊᾔї¢◎ⅾ℮')
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	80	+ self.query_record(kDNSServiceType_SINK, 'ʊᾔї¢◎ⅾ℮')
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	81
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	82	DNSServiceRemoveRecord(sdRef, RecordRef)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	83	@@ -245,1 +245,24 @@ def test_createconnection_registerrecord_reconfirmrecord(self):
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	84	self.assert_(RecordRef.value is None)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	85	+
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	86	+ # test UTF-8 unicode characters
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	87	+ sdRef = DNSServiceCreateConnection()
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	88	+ try:
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	89	+ RecordRef = \
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	90	+ DNSServiceRegisterRecord(sdRef,
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	91	+ kDNSServiceFlagsUnique,
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	92	+ fullname=self.fullname,
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	93	+ rrtype=kDNSServiceType_SINK,
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	94	+ rdata='ʊᾔї¢◎ⅾ℮',
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	95	+ callBack=cb)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	96	+ self.assert_(RecordRef.value is not None)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	97	+
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	98	+ self.wait_on_event(sdRef, done)
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	99	+
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	100	+ self.query_record(kDNSServiceType_SINK, 'ʊᾔї¢◎ⅾ℮')
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	101	+
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	102	+ DNSServiceReconfirmRecord(fullname=self.fullname,
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	103	+ rrtype=kDNSServiceType_SINK,
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	104	+ rdata='ʊᾔї¢◎ⅾ℮')
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	105	+ finally:
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	106	+ sdRef.close()
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	107	+
8f76366ca895 22685514 pybonjour.py fails with 'utf8' codec can't decode byte Yiteng Zhang <yiteng.zhang@oracle.com> parents: 5341 diff changeset	108	+ self.assert_(RecordRef.value is None)

author	Yiteng Zhang <yiteng.zhang@oracle.com>
	Fri, 12 Feb 2016 13:06:14 -0800
changeset 5457	8f76366ca895
parent 5341	acafdc8d7dfc
permissions	-rw-r--r--