From b2cf52c8827bf4d146344e51e44bb951cca75926 Mon Sep 17 00:00:00 2001 From: Seth Ladygo Date: Fri, 6 Mar 2020 14:50:12 -0800 Subject: [PATCH] markup: simplify resource ctors --- markup/webdav.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/markup/webdav.py b/markup/webdav.py index 5dec569..797e9fa 100644 --- a/markup/webdav.py +++ b/markup/webdav.py @@ -84,8 +84,9 @@ class RootFolderResource(MarkupDavResource): return None def get_children(self): - children = [CatalogFolderResource(CatalogFolderResource.PATH, self.user), - MarkupResource(MarkupResource.PATH, self.user)] + children = [CatalogFolderResource(user=self.user), + MarkupResource(user=self.user), + ] for child in children: yield child @@ -115,8 +116,9 @@ class RootFolderResource(MarkupDavResource): class CatalogFolderResource(MarkupDavResource): NAME = 'My Catalogs' PATH = f'/{NAME}/' - MARKUP_SUBMIT_NAME = 'For Markup' - MARKUP_SUBMIT_PATH = f'/{MARKUP_SUBMIT_NAME}/' + + def __init__(self, path=PATH, user=None): + super().__init__(path=path, user=user) def get_parent(self): return RootFolderResource(user=self.user) @@ -156,7 +158,7 @@ class CatalogFolderResource(MarkupDavResource): class CatalogResource(MarkupDavResource): def get_parent(self): - return CatalogFolderResource(path=CatalogFolderResource.PATH, user=self.user) + return CatalogFolderResource(user=self.user) def get_children(self): return @@ -238,6 +240,9 @@ class MarkupResource(MarkupDavResource, DummyFSDAVResource): PATH = f'/{NAME}/' SUBDIR = 'markup' + def __init__(self, path=PATH, user=None): + super().__init__(path=path, user=user) + def get_parent(self): parent_path = self.path[:-1] if len(parent_path):