[releng/abderrahim/refactor: 6/7] use pythonic formatting syntax

[Abderrahim Kitouni <akitouni src gnome org>]

commit e08b5b26fac7eca2a5f6c0c6f687d980f0c1b549
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sun Apr 5 09:30:04 2020 +0100

    use pythonic formatting syntax

 tools/smoketesting/convert-to-tarballs.py         | 4 ++--
 tools/smoketesting/tarball-conversion-3-34.config | 2 +-
 tools/smoketesting/tarball-conversion-3-36.config | 2 +-
 tools/smoketesting/tarball-conversion.config      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 4fc66d2..43f7155 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -117,11 +117,11 @@ class Options:
     def get_download_site(self, cvssite, modulename):
         for module, location in self.module_locations:
             if module == modulename:
-                return re.sub(r'\$module', modulename, location)
+                return location.format(module=modulename)
 
         for cvs, location in self.cvs_locations:
             if cvs == cvssite:
-                return re.sub(r'\$module', modulename, location)
+                return location.format(module=modulename)
         raise IOError('No download site found!\n')
 
     def _get_locations(self, locations_node):
diff --git a/tools/smoketesting/tarball-conversion-3-34.config 
b/tools/smoketesting/tarball-conversion-3-34.config
index 34c23cc..67f2bbb 100644
--- a/tools/smoketesting/tarball-conversion-3-34.config
+++ b/tools/smoketesting/tarball-conversion-3-34.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <conversioninfo>
   <locations>  FIXME: get a better name
-    <site cvs="gnome.org" location="https://download.gnome.org/sources/$module/"; />
+    <site cvs="gnome.org" location="https://download.gnome.org/sources/{module}/"; />
 
     <site module="ModemManager"              location="https://www.freedesktop.org/software/ModemManager/"/>
     <site module="PackageKit"                
location="https://www.freedesktop.org/software/PackageKit/releases/"/>
diff --git a/tools/smoketesting/tarball-conversion-3-36.config 
b/tools/smoketesting/tarball-conversion-3-36.config
index ff6d1a0..2faaacc 100644
--- a/tools/smoketesting/tarball-conversion-3-36.config
+++ b/tools/smoketesting/tarball-conversion-3-36.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <conversioninfo>
   <locations>  FIXME: get a better name
-    <site cvs="gnome.org" location="https://download.gnome.org/sources/$module/"; />
+    <site cvs="gnome.org" location="https://download.gnome.org/sources/{module}/"; />
 
     <site module="ModemManager"              location="https://www.freedesktop.org/software/ModemManager/"/>
     <site module="accountsservice"           
location="https://www.freedesktop.org/software/accountsservice/"/>
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index 6eb5713..a3af929 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <conversioninfo>
   <locations>  FIXME: get a better name
-    <site cvs="gnome.org" location="https://download.gnome.org/sources/$module/"; />
+    <site cvs="gnome.org" location="https://download.gnome.org/sources/{module}/"; />
 
     <site module="ModemManager"              location="https://www.freedesktop.org/software/ModemManager/"/>
     <site module="accountsservice"           
location="https://www.freedesktop.org/software/accountsservice/"/>