fix couchup for python3#1905

wohali merged 2 commits intoapache:masterapache/couchdb:masterfrom

klaemo:patch-1klaemo/couchdb:patch-1Copy head branch name to clipboard