[tracker: 2/2] Merge branch 'python3-port' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit dfaa5e398101585a86f470feff0b226b7efc25d0
Merge: 0762e0764 9fc1e1819
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Feb 21 21:01:40 2019 +0000

    Merge branch 'python3-port' into 'master'
    
    generators: Port to python3
    
    See merge request GNOME/tracker!60

 utils/data-generators/cc/convert_data.py         |  16 +--
 utils/data-generators/cc/gen_data.py             |  40 ++++----
 utils/data-generators/cc/generate                | 124 +++++++++++------------
 utils/data-generators/cc/mto.py                  |   2 +-
 utils/data-generators/cc/tools.py                |   4 +-
 utils/data-generators/create-tree-from-real-data |  19 ++--
 utils/g-ir-merge/g-ir-merge                      |   2 +-
 utils/ontology/service2rdf-xml.py                |  84 +++++++--------
 utils/ontology/service2xml.py                    |  24 ++---
 utils/sandbox/tracker-sandbox.py                 |   7 +-
 10 files changed, 157 insertions(+), 165 deletions(-)
---