Merge in changes from Gramps50

2018-10-29 09:32:35 -05:00
parent dd9ddab849 f2bc982c3d
commit 263a082afe
102 changed files with 19135 additions and 4157 deletions
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,8 @@ def intltool_version():
    Return the version of intltool as a tuple.
    '''
    if sys.platform == 'win32':
-        cmd = ["perl", "-e print qx(intltool-update --version) =~ m/(\d+.\d+.\d+)/;"]
+        cmd = ["perl",
+               r"-e print qx(intltool-update --version) =~ m/(\d+.\d+.\d+)/;"]
        try:
            ver, ret = subprocess.Popen(cmd ,stdout=subprocess.PIPE,
                stderr=subprocess.PIPE, shell=True).communicate()