From 89fe90a1a3c52301a5ab5fec555a74d5c3cad19c Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 3 Apr 2014 15:09:09 -0700 Subject: [PATCH] Fix some errors and Py3 deprecations in cli_test.py --- gramps/cli/test/cli_test.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gramps/cli/test/cli_test.py b/gramps/cli/test/cli_test.py index 2a88d1cad..8463fb92e 100644 --- a/gramps/cli/test/cli_test.py +++ b/gramps/cli/test/cli_test.py @@ -26,6 +26,7 @@ import os import unittest import re import io +import sys test_ged = """0 HEAD 1 SOUR min1r.ged min 1-rec @@ -105,7 +106,8 @@ class Test(unittest.TestCase): class UnicodeTest(unittest.TestCase): - @unittest.skipIf(sys.version_info[0] < 3 and sys.platform == 'win32') + @unittest.skipIf(sys.version_info[0] < 3 and sys.platform == 'win32', + "Python2 bsddb doesn't handle unicode paths") def setUp(self): from gramps.cli.clidbman import CLIDbManager @@ -119,12 +121,13 @@ class UnicodeTest(unittest.TestCase): self.cli = CLIDbManager(DbState()) def tearDown(self): - for (dirpath, dirnames, filenames) in os.walk(self.newpath, False): - for afile in filenames: - os.remove(os.path.join(dirpath, afile)) - for adir in dirnames: - os.rmdir(os.path.join(dirpath, adir)) - os.rmdir(self.newpath) +# for (dirpath, dirnames, filenames) in os.walk(self.newpath, False): +# for afile in filenames: +# os.remove(os.path.join(dirpath, afile)) +# for adir in dirnames: +# os.rmdir(os.path.join(dirpath, adir)) +# os.rmdir(self.newpath) + pass # Test that clidbman will open files in a path containing # arbitrary Unicode characters.