refactor PluginIndexes.unindex.UnIndex.query_index fixing #55 and #56

[d-maurer]

Fixes #56

[d-maurer]

@ale-rt

I think it should be if not six.PY2 and isinstance(code, six.binary_type)

I assume you wanted to comment on @icemac 's "widcode" changes (which is Python2/Python3 dependent). My PR is independent of Python 2/3 (and "six").

[ale-rt]

You are right @d-maurer I was commenting on the merge commit :)
Did not follow a lot the development recently but it seems master already has a problem here:

Products.ZCatalog/src/Products/ZCTextIndex/WidCode.py

Lines 88 to 96 in 1ec5a94

	def decode(code):
	# Handle bytes that were not properly decoded during Python 3 conversion
	if not isinstance(code, str):
	code = code.decode('latin1')
	# Decode a string into a list of wids.
	get = _decoding.get
	# Obscure: while _decoding does have the key '\x80', its value is 0,
	# so the "or" here calls _decode('\x80') anyway.
	return [get(p) or _decode(p) for p in _prog.findall(code)]

On Py2 decoding text (if possible) will return again text:

     if not isinstance(code, str): 
         code = code.decode('latin1') 

I will open an issue for that (see #58)

[hannosch]

Sorry, there are too many changes here for me to review this. Given that in addition #55 is based on a misunderstanding, I can't approve this.

[icemac]

I do not know the code enough to feel competent to review this PR.

[d-maurer]

@hannosch has convinced me that #55 is not a bug.

In my view, the code in Products.PluginIndexes.unindex.UnIndex.query_index is horrible (difficult to understand, difficult to maintain, difficult to read) but apparently, it does work.

A refactorisation would have helped me with the upcoming version of Products.AdvancedQuery. But, meanwihile I have found an (even more general) approach: AdvancedQuery will use the elementary indexing information but implement the filtering itself. Thus, I am no longer interested in the quality of the base implementations -- but still will keep you informed about bugs I detect (or think to have detected).