comparison roundup/admin.py @ 5525:bb7865241f8a

Make CSV import/export compatible across Python versions (also RDBMS journals) (issue 2550976, issue 2550975). The roundup-admin export and import commands are used for migrating between different database backends. It is desirable that they should be usable also for migrations between Python 2 and Python 3, and in some cases (e.g. with the anydbm backend) this may be required. To be usable for such migrations, the format of the generated CSV files needs to be stable, meaning the same as currently used with Python 2. The export process uses repr() to produce the fields in the CSV files and eval() to convert them back to Python data structures. repr() of strings with non-ASCII characters produces different results for Python 2 and Python 3. This patch adds repr_export and eval_import functions to roundup/anypy/strings.py which provide the required operations that are just repr() and eval() in Python 2, but are more complicated in Python 3 to use data representations compatible with Python 2. These functions are then used in the required places for export and import. repr() and eval() are also used in storing the dict of changed values in the journal for the RDBMS backends. It is similarly desirable that the database be compatible between Python 2 and Python 3, so that export and import do not need to be used for a migration between Python versions for non-anydbm back ends. Thus, this patch changes rdbms_common.py in the places involved in storing journals in the database, not just in those involved in import/export. Given this patch, import/export with non-ASCII characters appear based on some limited testing to work across Python versions, and an instance using the sqlite backend appears to be compatible between Python versions without needing import/export, *if* the sessions/otks databases (which use anydbm) are deleted when changing Python version.
author Joseph Myers <jsm@polyomino.org.uk>
date Sun, 02 Sep 2018 23:48:04 +0000
parents 52ff4c59fb05
children b76be13e027e
comparison
equal deleted inserted replaced
5524:674ad58667b4 5525:bb7865241f8a
30 import roundup.instance 30 import roundup.instance
31 from roundup.configuration import CoreConfig, NoConfigError 31 from roundup.configuration import CoreConfig, NoConfigError
32 from roundup.i18n import _ 32 from roundup.i18n import _
33 from roundup.exceptions import UsageError 33 from roundup.exceptions import UsageError
34 from roundup.anypy.my_input import my_input 34 from roundup.anypy.my_input import my_input
35 from roundup.anypy.strings import repr_export
35 36
36 try: 37 try:
37 from UserDict import UserDict 38 from UserDict import UserDict
38 except ImportError: 39 except ImportError:
39 from collections import UserDict 40 from collections import UserDict
1199 if self.verbose: 1200 if self.verbose:
1200 sys.stdout.write('\rExporting %s - %s'%(classname, nodeid)) 1201 sys.stdout.write('\rExporting %s - %s'%(classname, nodeid))
1201 sys.stdout.flush() 1202 sys.stdout.flush()
1202 node = cl.getnode(nodeid) 1203 node = cl.getnode(nodeid)
1203 exp = cl.export_list(propnames, nodeid) 1204 exp = cl.export_list(propnames, nodeid)
1204 lensum = sum ([len (repr(node[p])) for p in propnames]) 1205 lensum = sum ([len (repr_export(node[p])) for p in propnames])
1205 # for a safe upper bound of field length we add 1206 # for a safe upper bound of field length we add
1206 # difference between CSV len and sum of all field lengths 1207 # difference between CSV len and sum of all field lengths
1207 d = sum ([len(x) for x in exp]) - lensum 1208 d = sum ([len(x) for x in exp]) - lensum
1208 assert (d > 0) 1209 assert (d > 0)
1209 for p in propnames: 1210 for p in propnames:
1210 ll = len(repr(node[p])) + d 1211 ll = len(repr_export(node[p])) + d
1211 if ll > max_len: 1212 if ll > max_len:
1212 max_len = ll 1213 max_len = ll
1213 writer.writerow(exp) 1214 writer.writerow(exp)
1214 if export_files and hasattr(cl, 'export_files'): 1215 if export_files and hasattr(cl, 'export_files'):
1215 cl.export_files(dir, nodeid) 1216 cl.export_files(dir, nodeid)

Roundup Issue Tracker: http://roundup-tracker.org/