Move PairSet/DefaultOrderedDict to graphql.core.pyutils.

* Implement unit tests for PairSet.

Author: jhgg

graphql/core/pyutils/__init__.py

@@ -0,0 +1,18 @@
+class PairSet(object):
+    def __init__(self):
+        self._data = set()
+
+    def __contains__(self, item):
+        return item in self._data
+
+    def has(self, a, b):
+        return (a, b) in self._data
+
+    def add(self, a, b):
+        self._data.add((a, b))
+        self._data.add((b, a))
+        return self
+
+    def remove(self, a, b):
+        self._data.discard((a, b))
+        self._data.discard((b, a))

graphql/core/validation/rules/utils.py renamed to graphql/core/pyutils/default_ordered_dict.py

@@ -1,26 +1,6 @@
 from collections import Callable, OrderedDict
 
 
-class PairSet(object):
-    def __init__(self):
-        self._data = set()
-
-    def __contains__(self, item):
-        return item in self._data
-
-    def has(self, a, b):
-        return (a, b) in self._data
-
-    def add(self, a, b):
-        self._data.add((a, b))
-        self._data.add((b, a))
-        return self
-
-    def remove(self, a, b):
-        self._data.discard((a, b))
-        self._data.discard((b, a))
-
-
 class DefaultOrderedDict(OrderedDict):
     # Source: http://stackoverflow.com/a/6190500/562769
     def __init__(self, default_factory=None, *a, **kw):

graphql/core/pyutils/pair_set.py

@@ -0,0 +1,18 @@
+class PairSet(object):
+    def __init__(self):
+        self._data = set()
+
+    def __contains__(self, item):
+        return item in self._data
+
+    def has(self, a, b):
+        return (a, b) in self._data
+
+    def add(self, a, b):
+        self._data.add((a, b))
+        self._data.add((b, a))
+        return self
+
+    def remove(self, a, b):
+        self._data.discard((a, b))
+        self._data.discard((b, a))

graphql/core/validation/rules/overlapping_fields_can_be_merged.py

@@ -3,14 +3,15 @@
 from ...error import GraphQLError
 from ...language import ast
 from ...language.printer import print_ast
+from ...pyutils.default_ordered_dict import DefaultOrderedDict
+from ...pyutils.pair_set import PairSet
 from ...type.definition import (
     GraphQLInterfaceType,
     GraphQLObjectType,
     get_named_type,
 )
 from ...utils.type_from_ast import type_from_ast
 from .base import ValidationRule
-from .utils import DefaultOrderedDict, PairSet
 
 
 class OverlappingFieldsCanBeMerged(ValidationRule):

tests/core_pyutils/test_pair_set.py

@@ -0,0 +1,27 @@
+from graphql.core.pyutils.pair_set import PairSet
+
+
+def test_pair_set():
+    ps = PairSet()
+
+    ps.add(1, 2)
+    ps.add(2, 4)
+
+    assert ps.has(1, 2)
+    assert ps.has(2, 1)
+    assert (1, 2) in ps
+    assert (2, 1) in ps
+    assert ps.has(4, 2)
+    assert ps.has(2, 4)
+
+    assert not ps.has(2, 3)
+    assert not ps.has(1, 3)
+
+    ps.remove(1, 2)
+    assert not ps.has(1, 2)
+    assert not ps.has(2, 1)
+    assert (1, 2) not in ps
+    assert (2, 1) not in ps
+
+    assert ps.has(4, 2)
+    assert ps.has(2, 4)