annotate roundup/anypy/dbm_.py @ 5653:ba67e397f063
Fix string/bytes issues under python 3.
1) cgi/client.py: override cgi.FieldStorage's make_file so that file
is always created in binary/byte mode. This means that json (and
xml) are bytes not strings.
2) rest.py: try harder to find dicttoxml in roundup directory or on
sys.path. This just worked under python 2 but python 3 only
searches sys.path by default and does not search relative like
python 2.
3) rest.py: replace headers.getheader call removed from python 3 with
equivalent code.
4) rest.py: make value returned from dispatch into bytes not string.
5) test/caseinsensitivedict.py, test/test_CaseInsensitiveDict.py:
get code from stackoverflow that implements a case insensitive key
dict. So dict['foo'], dict['Foo'] are the same entry. Used for
looking up headers in mocked http rewuset header array.
6) test/rest_common.py: rework tests for etags and rest to properly
supply bytes to the called routines. Calls to s2b and b2s and use
of BytesIO and overriding make_file in cgi.FieldStorage to try to
make sure it works under python 3.
| author |
John Rouillard <rouilj@ieee.org> |
| date |
Sun, 17 Mar 2019 19:28:26 -0400 |
| parents |
d5da643b3d25 |
| children |
|
| rev |
line source |
4360
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
1 # In Python 3 the "anydbm" module was renamed to be "dbm" which is now a
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
2 # package containing the various implementations. The "wichdb" module's
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
3 # whichdb() function was moved to the new "dbm" module.
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
4
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
5 try:
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
6 # old school first because <3 had a "dbm" module too...
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
7 import anydbm
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
8 from whichdb import whichdb
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
9 except ImportError:
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
10 # python 3+
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
11 import dbm as anydbm
|
Richard Jones <richard@users.sourceforge.net>
parents:
diff
changeset
|
12 whichdb = anydbm.whichdb
|