Compare commits

..

No commits in common. "852f47237413a55fe4e3320b98a4bef2fcdb4fed" and "e0306bf3a58c435aac7451d0eaa6936bd436cb53" have entirely different histories.

2 changed files with 4 additions and 29 deletions

View File

@ -753,6 +753,9 @@ class Headline:
@property @property
def tags(self): def tags(self):
if isinstance(self.parent, OrgDoc):
return list(self.shallow_tags)
else:
return list(self.shallow_tags) + self.parent.tags return list(self.shallow_tags) + self.parent.tags
def add_tag(self, tag: str): def add_tag(self, tag: str):
@ -2277,17 +2280,6 @@ class OrgDoc:
def path(self): def path(self):
return self._path return self._path
@property
def tags(self) -> list[str]:
for kw in self.keywords:
if kw.key == "FILETAGS":
return kw.value.strip(':').split(':')
return []
@property
def shallow_tags(self) -> list[str]:
return self.tags
## Querying ## Querying
def get_links(self): def get_links(self):
for headline in self.headlines: for headline in self.headlines:

View File

@ -889,23 +889,6 @@ class TestSerde(unittest.TestCase):
h1_2_h2 = h1_2.children[0] h1_2_h2 = h1_2.children[0]
self.assertEqual(sorted(h1_2_h2.tags), ['filetag', 'otherh1tag', 'otherh2tag']) self.assertEqual(sorted(h1_2_h2.tags), ['filetag', 'otherh1tag', 'otherh2tag'])
def test_shallow_tag_property_read_13(self):
with open(os.path.join(DIR, "13-tags.org")) as f:
orig = f.read()
doc = loads(orig)
self.assertEqual(doc.shallow_tags, ['filetag'])
h1_1, h1_2 = doc.getTopHeadlines()
self.assertEqual(sorted(h1_1.shallow_tags), ['h1tag'])
self.assertEqual(sorted(h1_2.shallow_tags), ['otherh1tag'])
h1_1_h2 = h1_1.children[0]
self.assertEqual(sorted(h1_1_h2.shallow_tags), ['h2tag'])
h1_2_h2 = h1_2.children[0]
self.assertEqual(sorted(h1_2_h2.shallow_tags), ['otherh2tag'])
def print_tree(tree, indentation=0, headline=None): def print_tree(tree, indentation=0, headline=None):
for element in tree: for element in tree:
print(" " * indentation * 2, "EL:", element) print(" " * indentation * 2, "EL:", element)