summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kluyver <takowl@gmail.com>2013-05-25 17:49:46 +0100
committerThomas Kluyver <takowl@gmail.com>2013-05-25 17:49:46 +0100
commit8f8b8290aee9a15dc0731cd0ec419dead60cb66c (patch)
treee3560ad62ebe9965384f307d165dd40a47d45a71
parent1ad37f33877f7f081e695d01d180c826c2589144 (diff)
Rename xdg.Menu.Parser to XMLMenuBuilder
-rw-r--r--test/test-menu-rules.py4
-rw-r--r--xdg/Menu.py6
-rw-r--r--xdg/MenuEditor.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/test/test-menu-rules.py b/test/test-menu-rules.py
index 1bfafb1..0593d5c 100644
--- a/test/test-menu-rules.py
+++ b/test/test-menu-rules.py
@@ -1,7 +1,7 @@
import xml.etree.cElementTree as etree
import unittest
-from xdg.Menu import Parser, Rule
+from xdg.Menu import XMLMenuBuilder, Rule
_tests = [
@@ -160,7 +160,7 @@ class RulesTest(unittest.TestCase):
"""Basic rule matching tests"""
def test_rule_from_node(self):
- parser = Parser(debug=True)
+ parser = XMLMenuBuilder(debug=True)
for i, test in enumerate(_tests):
root = etree.fromstring(test['doc'])
rule = parser.parse_rule(root)
diff --git a/xdg/Menu.py b/xdg/Menu.py
index ba5fe97..01b59f0 100644
--- a/xdg/Menu.py
+++ b/xdg/Menu.py
@@ -588,7 +588,7 @@ def _dedupe(_list):
return _list
-class Parser(object):
+class XMLMenuBuilder(object):
def __init__(self, debug=False):
self.debug = debug
@@ -1119,6 +1119,6 @@ class MenuEntryCache:
def parse(filename=None):
"""Helper function.
- Equivalent to calling xdg.Menu.Parser().parse(filename)
+ Equivalent to calling xdg.Menu.XMLMenuBuilder().parse(filename)
"""
- return Parser().parse(filename)
+ return XMLMenuBuilder().parse(filename)
diff --git a/xdg/MenuEditor.py b/xdg/MenuEditor.py
index 0324f40..a47c84a 100644
--- a/xdg/MenuEditor.py
+++ b/xdg/MenuEditor.py
@@ -29,7 +29,7 @@ class MenuEditor(object):
self.menu = None
self.filename = None
self.tree = None
- self.parser = Parser()
+ self.parser = XMLMenuBuilder()
self.parse(menu, filename, root)
# fix for creating two menus with the same name on the fly