From c9198b813f21fa78288ef16fc7b5c8eceb8ac1b0 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 4 Jun 2019 23:39:29 +0200 Subject: [PATCH] Remove string conversion of the ACL, fix setup --- certbot/compat/filesystem.py | 6 +++--- certbot/tests/compat/filesystem_test.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/certbot/compat/filesystem.py b/certbot/compat/filesystem.py index 6647761e5..e0533da86 100644 --- a/certbot/compat/filesystem.py +++ b/certbot/compat/filesystem.py @@ -152,18 +152,18 @@ def _compare_dacls(dacl1, dacl2): aces1 = [dacl1.GetAce(index) for index in range(0, dacl1.GetAceCount())] aces2 = [dacl2.GetAce(index) for index in range(0, dacl2.GetAceCount())] - # Convert PySIDs into hashable objects + # Convert PySIDs into hashable objects aces1_refined = [] aces2_refined = [] for ace in aces1: if len(ace) == 3: aces1_refined.append((ace[0], ace[1], str(ace[2]))) else: - aces1_refined.append((ace[0], ace[1], ace[2], ace[3], str(ace[4]))) # type: ignore + aces1_refined.append((ace[0], ace[1], ace[2], ace[3], ace[4])) # type: ignore for index, ace in enumerate(aces2): if len(ace) == 3: aces2_refined.append((ace[0], ace[1], str(ace[2]))) else: - aces2_refined.append((ace[0], ace[1], ace[2], ace[3], str(ace[4]))) # type: ignore + aces2_refined.append((ace[0], ace[1], ace[2], ace[3], ace[4])) # type: ignore return set(aces1_refined) == set(aces2_refined) diff --git a/certbot/tests/compat/filesystem_test.py b/certbot/tests/compat/filesystem_test.py index 9e15736fc..2a24503fa 100644 --- a/certbot/tests/compat/filesystem_test.py +++ b/certbot/tests/compat/filesystem_test.py @@ -23,6 +23,7 @@ ADMINS_SID = 'S-1-5-32-544' class WindowsChmodTests(TempDirTestCase): """Unit tests for Windows chmod function in filesystem module""" def setUp(self): + super(WindowsChmodTests, self).setUp() self.probe_path = _create_probe(self.tempdir) def test_symlink_resolution(self):