Skip to content

Merge classes divided in multiple files into modules #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 9, 2021
Merged

Merge classes divided in multiple files into modules #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2073581
Rename DOMString.py -> type.py
hepheir Jun 8, 2021
1873009
Update __init__.py
hepheir Jun 8, 2021
d3b3f07
Rename DOMException.py -> exception.py
hepheir Jun 8, 2021
b9ab0c0
Update import path for `DOMException`
hepheir Jun 8, 2021
0919457
Move all tests to /test/
hepheir Jun 8, 2021
8786cc9
Create interface.py
hepheir Jun 8, 2021
2b6c6ed
Merge DOMImplementation.py into interface.py
hepheir Jun 8, 2021
ba71cb9
Merge DocumentFragment.py into interface.py
hepheir Jun 8, 2021
961a83f
Add `Document`
hepheir Jun 8, 2021
beb65f0
Update interface.py
hepheir Jun 8, 2021
b9d2497
Delete /w3/python/core/fundamental_interface
hepheir Jun 9, 2021
7bb13ce
Rename .../typing/__init__.py -> .../typing.py
hepheir Jun 9, 2021
c4c9a35
Delete two __init__.py files
hepheir Jun 9, 2021
f39d656
Update dom.py
hepheir Jun 9, 2021
7502cdd
Delete typing.py
hepheir Jun 9, 2021
f366ad2
Update Node_test.py
hepheir Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...undamental_interface/DOMException_test.py → test/DOMException_test.py
View file
Open in desktop
File renamed without changes.
0 ...re/fundamental_interface/NodeList_test.py → test/NodeList_test.py
View file
Open in desktop
File renamed without changes.
41 changes: 20 additions & 21 deletions ...n/core/fundamental_interface/Node_test.py → test/Node_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,29 @@

from w3.dom import DOMException
from w3.dom import Node
from w3.dom import NodeType


def _create_document_node():
return Node(node_type=NodeType.DOCUMENT_NODE,
return Node(node_type=Node.DOCUMENT_NODE,
node_name='#document',
owner_document=None)


def _create_element_node(document: Node):
assert document.node_type == NodeType.DOCUMENT_NODE
return Node(node_type=NodeType.ELEMENT_NODE,
assert document.node_type == Node.DOCUMENT_NODE
return Node(node_type=Node.ELEMENT_NODE,
node_name='tagName',
owner_document=document)


class TestDunder_Init(unittest.TestCase):
def test_Default(self):
# Creating document node.
document = Node(node_type=NodeType.DOCUMENT_NODE,
document = Node(node_type=Node.DOCUMENT_NODE,
node_name='#document',
owner_document=None,
read_only=False)
self.assertEqual(document.node_type, NodeType.DOCUMENT_NODE)
self.assertEqual(document.node_type, Node.DOCUMENT_NODE)
self.assertEqual(document.node_name, '#document')
self.assertEqual(document.node_value, '')

Expand All @@ -36,30 +35,30 @@ def setUp(self) -> None:
return super().setUp()

def testGetter(self):
text = Node(node_type=NodeType.TEXT_NODE,
text = Node(node_type=Node.TEXT_NODE,
node_name='#text',
owner_document=self.document,
node_value='lorem ipsum')
self.assertEqual(text.node_value, 'lorem ipsum')

def testConstructor(self):
text = Node(node_type=NodeType.TEXT_NODE,
text = Node(node_type=Node.TEXT_NODE,
node_name='#text',
owner_document=self.document,
node_value='foo',
read_only=False)
self.assertEqual(text.node_value, 'foo')

def testSetter(self):
text = Node(node_type=NodeType.TEXT_NODE,
text = Node(node_type=Node.TEXT_NODE,
node_name='#text',
owner_document=self.document,
read_only=False)
text.node_value = 'bar'
self.assertEqual(text.node_value, 'bar')

def testSetter_ReadOnly(self):
text = Node(node_type=NodeType.TEXT_NODE,
text = Node(node_type=Node.TEXT_NODE,
node_name='#text',
owner_document=self.document,
node_value='foo',
Expand All @@ -73,27 +72,27 @@ def testSetter_ReadOnly(self):
self.assertEqual(text.node_value, 'foo')


class TestProperty_NodeType(unittest.TestCase):
class TestProperty_Node(unittest.TestCase):
def setUp(self) -> None:
self.document = _create_document_node()
return super().setUp()

def testGetter(self):
for node_type in NodeType:
for node_type in Node:
node = Node(node_type=node_type,
node_name='',
owner_document=self.document)
self.assertEqual(node.node_type, node_type)

def testSetter_CorrectTypes(self):
for node_type in NodeType:
for node_type in Node:
with self.subTest(node_type=node_type):
Node(node_type=node_type,
node_name='',
owner_document=self.document)

def testSetter_WrongTypes(self):
for node_type in [-1, None, 'hi', True, Node, NodeType, 'DOCUMENT_NODE']:
for node_type in [-1, None, 'hi', True, Node, Node, 'DOCUMENT_NODE']:
with self.subTest(node_type=node_type):
with self.assertRaises((TypeError, ValueError)):
Node(node_type=node_type,
Expand All @@ -107,7 +106,7 @@ def setUp(self) -> None:
return super().setUp()

def testConstrutor(self):
docfrag = Node(node_type=NodeType.DOCUMENT_FRAGMENT_NODE,
docfrag = Node(node_type=Node.DOCUMENT_FRAGMENT_NODE,
node_name='#document-fragment',
owner_document=self.document)
self.assertIsNone(docfrag.parent_node)
Expand Down Expand Up @@ -205,7 +204,7 @@ def test_InsertDocumentFragmentNode(self):
# <document>
# ======================================
parent_node = _create_element_node(self.document)
docfrag_node = Node(node_type=NodeType.DOCUMENT_FRAGMENT_NODE,
docfrag_node = Node(node_type=Node.DOCUMENT_FRAGMENT_NODE,
node_name='#document-fragment',
owner_document=self.document)
first_child_node = _create_element_node(self.document)
Expand Down Expand Up @@ -248,7 +247,7 @@ def test_Raises_NO_MODIFICATION_ALLOWED_ERR(self):
# <new_child_node/>
# <document>
# ======================================
parent_node_readonly = Node(node_type=NodeType.ELEMENT_NODE,
parent_node_readonly = Node(node_type=Node.ELEMENT_NODE,
node_name='tagName',
owner_document=self.document,
read_only=True)
Expand Down Expand Up @@ -330,7 +329,7 @@ def test_AppendDocumentFragmentNode(self):
# <document>
# ======================================
parent_node = _create_element_node(self.document)
docfrag_node = Node(node_type=NodeType.DOCUMENT_FRAGMENT_NODE,
docfrag_node = Node(node_type=Node.DOCUMENT_FRAGMENT_NODE,
node_name='#document-fragment',
owner_document=self.document)
first_child_node = _create_element_node(self.document)
Expand Down Expand Up @@ -373,7 +372,7 @@ def test_Raises_NO_MODIFICATION_ALLOWED_ERR(self):
# <new_child_node/>
# <document>
# ======================================
parent_node_readonly = Node(node_type=NodeType.ELEMENT_NODE,
parent_node_readonly = Node(node_type=Node.ELEMENT_NODE,
node_name='tagName',
owner_document=self.document,
read_only=True)
Expand Down Expand Up @@ -446,7 +445,7 @@ def test_Raises_NO_MODIFICATION_ALLOWED_ERR(self):
# <new_child_node/>
# <document>
# ======================================
parent_node_readonly = Node(node_type=NodeType.ELEMENT_NODE,
parent_node_readonly = Node(node_type=Node.ELEMENT_NODE,
node_name='tagName',
owner_document=self.document,
read_only=True)
Expand Down Expand Up @@ -533,7 +532,7 @@ def test_Raises_NO_MODIFICATION_ALLOWED_ERR(self):
# <document>
# ======================================
child_node = _create_element_node(self.document)
parent_node = Node(node_type=NodeType.ELEMENT_NODE,
parent_node = Node(node_type=Node.ELEMENT_NODE,
node_name='tagName',
owner_document=self.document,
child_nodes=[child_node],
Expand Down
24 changes: 18 additions & 6 deletions w3/dom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,21 @@


# Bring in subpackages.
from w3.python.core import DOMException
from w3.python.core import DOMImplementation
from w3.python.core import DOMString
from w3.python.core import Node
from w3.python.core import NodeType
from w3.python.core import NodeList
from w3.python.core.type import DOMString
from w3.python.core.exception import DOMException
from w3.python.core.interface import DOMImplementation
from w3.python.core.interface import Document
from w3.python.core.interface import Node
from w3.python.core.interface import NodeList
from w3.python.core.interface import NodeList
from w3.python.core.interface import NamedNodeMap
from w3.python.core.interface import CharacterData
from w3.python.core.interface import Attr
from w3.python.core.interface import Element
from w3.python.core.interface import Text
from w3.python.core.interface import Comment
from w3.python.core.interface import CDATASection
from w3.python.core.interface import DocumentType
from w3.python.core.interface import Notation
from w3.python.core.interface import EntityReference
from w3.python.core.interface import ProcessingInstruction
6 changes: 0 additions & 6 deletions w3/python/__init__.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions w3/python/core/__init__.py
View file
Open in desktop

This file was deleted.

0 ...ore/fundamental_interface/DOMException.py → w3/python/core/exception.py
View file
Open in desktop
File renamed without changes.
27 changes: 0 additions & 27 deletions w3/python/core/fundamental_interface/DOMImplementation.py
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions w3/python/core/fundamental_interface/DocumentFragment.py
View file
Open in desktop

This file was deleted.

Loading