format python

3 files changed, 183 insertions, 39 deletions

diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
index 4798cf503..2c8c7e8ec 100755
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ b/src/fs/test_gnunet_fs_idx.py.in
@@ -11,7 +11,7 @@
 #    WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #    Affero General Public License for more details.
-#   
+#
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -43,7 +43,9 @@ elif os.name == 'nt':
     unindex = './gnunet-unindex.exe'
 
 if os.name == "nt":
-    shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True)
+    shutil.rmtree(
+        os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True
+    )
 else:
     shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
 
@@ -53,22 +55,59 @@ arm.communicate()
 try:
     pub = pexpect()
 
-    pub.spawn(None, [publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m', "description:Test archive", '-k', 'tst', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"))
+    pub.spawn(
+        None, [
+            publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m',
+            "description:Test archive", '-k', 'tst',
+            'test_gnunet_fs_rec_data.tgz'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"
+        )
+    )
 
     down = pexpect()
-    down.spawn(None, [download, '-c', 'test_gnunet_fs_idx_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    down.expect("stdout", re.compile(r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"))
+    down.spawn(
+        None, [
+            download, '-c', 'test_gnunet_fs_idx_data.conf', '-o',
+            'test_gnunet_fs_rec_data.tar.gz',
+            'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
+    down.expect(
+        "stdout",
+        re.compile(
+            r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"
+        )
+    )
     os.remove("test_gnunet_fs_rec_data.tar.gz")
 
     un = pexpect()
-    un.spawn(None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    un.spawn(
+        None, [
+            unindex, '-c', 'test_gnunet_fs_idx_data.conf',
+            'test_gnunet_fs_rec_data.tgz'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
     un.expect("stdout", re.compile(r'Unindexing done\.\r?\n'))
 
 finally:
-    arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf'])
+    arm = subprocess.Popen([
+        gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf'
+    ])
     arm.communicate()
     if os.name == "nt":
-        shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True)
+        shutil.rmtree(
+            os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True
+        )
     else:
         shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index a1e4db9d5..abb3d0b83 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -11,7 +11,7 @@
 #    WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #    Affero General Public License for more details.
-#   
+#
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -38,8 +38,8 @@ except NameError:
 reload(sys)
 
 # Force encoding to utf-8, as this test otherwise fails
-# on some systems (see #5094). In Python 3+ there is no attribute 
-# sys.setdefaultencoding anymore. 
+# on some systems (see #5094). In Python 3+ there is no attribute
+# sys.setdefaultencoding anymore.
 if (3 < sys.version_info[0]):
     sys.setdefaultencoding('utf8')
 
@@ -68,9 +68,11 @@ if "GNUNET_PREFIX" in os.environ:
 else:
     print("You need to export GNUNET_PREFIX")
     sys.exit(1)
-    
+
 if os.name == "nt":
-    shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True)
+    shutil.rmtree(
+        os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True
+    )
 else:
     shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True)
 
@@ -80,23 +82,68 @@ arm.communicate()
 # first, basic publish-search-download run
 try:
     pub = pexpect()
-    pub.spawn(None, [publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m', "description:Test archive", '-k', 'tst', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    pub.expect("stdout", re.compile(r"Publishing `.+test_gnunet_fs_rec_data.tgz' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"))
+    pub.spawn(
+        None, [
+            publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m',
+            "description:Test archive", '-k', 'tst',
+            'test_gnunet_fs_rec_data.tgz'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
+    pub.expect(
+        "stdout",
+        re.compile(r"Publishing `.+test_gnunet_fs_rec_data.tgz' done\.\r?\n")
+    )
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"
+        )
+    )
 
     s = pexpect()
-    s.spawn(None, [search, '-V', '-t', '1000 ms', '-N', '1', '-c', 'test_gnunet_fs_psd_data.conf', 'tst'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    s.expect("stdout", re.compile(r'gnunet-download -o "test_gnunet_fs_rec_data.tgz" gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n'))
+    s.spawn(
+        None, [
+            search, '-V', '-t', '1000 ms', '-N', '1', '-c',
+            'test_gnunet_fs_psd_data.conf', 'tst'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
+    s.expect(
+        "stdout",
+        re.compile(
+            r'gnunet-download -o "test_gnunet_fs_rec_data.tgz" gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n'
+        )
+    )
 
     down = pexpect()
-    down.spawn(None, [download, '-c', 'test_gnunet_fs_psd_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    down.expect("stdout", re.compile(r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"))
+    down.spawn(
+        None, [
+            download, '-c', 'test_gnunet_fs_psd_data.conf', '-o',
+            'test_gnunet_fs_rec_data.tar.gz',
+            'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
+    down.expect(
+        "stdout",
+        re.compile(
+            r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"
+        )
+    )
     os.remove("test_gnunet_fs_rec_data.tar.gz")
 
 finally:
-    arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf'])
+    arm = subprocess.Popen([
+        gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf'
+    ])
     arm.communicate()
     if os.name == "nt":
-        shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True)
+        shutil.rmtree(
+            os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True
+        )
     else:
         shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True)
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index 0f881564f..0e1512b26 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -50,7 +50,9 @@ elif os.name == 'nt':
     directory = './gnunet-directory.exe'
 
 if os.name == "nt":
-    shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True)
+    shutil.rmtree(
+        os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True
+    )
 else:
     shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True)
 
@@ -65,33 +67,83 @@ tar.extractall()
 # first, basic publish-search-download run
 try:
     pub = pexpect()
-    pub.spawn(None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    pub.spawn(
+        None, [
+            publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir',
+            'dir/'
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
     # Can't say much for publishing, except that the last one is the toplevel directory
     pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
+        )
+    )
     pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
+        )
+    )
     pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
+        )
+    )
     pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
+        )
+    )
     pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
+        )
+    )
     pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
-    pub.expect("stdout", re.compile(r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n"))
+    pub.expect(
+        "stdout",
+        re.compile(
+            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
+        )
+    )
+    pub.expect(
+        "stdout", re.compile(r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n")
+    )
     m = pub.expect("stdout", re.compile(r".+\r?\n"))
     if not m:
         sys.exit(3)
     output = m.string
-    url = output[output.find("`")+1:output.find("'")]
+    url = output[output.find("`") + 1:output.find("'")]
 
     down = pexpect()
-    down.spawn(None, [download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o', 'rdir.gnd', url], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    down.spawn(
+        None, [
+            download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o',
+            'rdir.gnd', url
+        ],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
     down.expect("stdout", re.compile(r"Downloading `rdir.gnd' done (.*).\r?\n"))
 
     d = pexpect()
-    d.spawn(None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    d.spawn(
+        None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
     d.expect("stdout", re.compile(r"Directory `a/' meta data:\r?\n"))
     d.expect("stdout", re.compile(r"Directory `a/' contents:\r?\n"))
     d.expect("stdout", re.compile(r"COPYING (.*)\r?\n"))
@@ -101,14 +153,20 @@ try:
     os.remove("rdir/a.gnd")
     diff = dcdiff('dir', 'rdir')
     if len(diff) != 0:
-        raise Exception("Unexpected difference between source directory and downloaded result:\n{}".format(diff))
-
+        raise Exception(
+            "Unexpected difference between source directory and downloaded result:\n{}"
+            .format(diff)
+        )
 
 finally:
-    arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf'])
+    arm = subprocess.Popen([
+        gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf'
+    ])
     arm.communicate()
     if os.name == "nt":
-        shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True)
+        shutil.rmtree(
+            os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True
+        )
     else:
         shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True)
     shutil.rmtree("dir", True)