Fix #2

apm/core.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
+import collections.abc as abc
 from copy import copy
 from dataclasses import is_dataclass
 from itertools import chain
-from typing import Optional, List, Dict, Union, Tuple, Callable, Mapping
+from typing import Optional, List, Dict, Union, Tuple, Callable
 
 from .generic import AutoEqHash, AutoRepr
 
@@ -136,7 +137,7 @@ def get_wildcard_matches(self) -> List:
  return wildcard_matches
 
 
-class MatchResult(Mapping):
+class MatchResult(abc.Mapping):
  def __init__(self, *, matches: bool, context: MatchContext, match_stack: List[Tuple]):
  self._matches: bool = matches
  self._context: MatchContext = context
@@ -221,7 +222,7 @@ def transform(pattern, f):
  def rf(p):
  return transform(p, f)
 
- if is_dataclass(pattern):
+ if is_dataclass(pattern) and not isinstance(pattern, type):
  pattern = Dataclass(type(pattern), pattern.__dict__)
 
  if isinstance(pattern, Nested):

tests/test_issues.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+import unittest
+# noinspection PyProtectedMember
+from dataclasses import dataclass
+
+from apm import *
+
+
+@dataclass
+class Foo:
+ x: int
+
+
+class UtilTests(unittest.TestCase):
+
+ def test_issue_2(self):
+ """https:/scravy/awesome-pattern-matching/issues/2"""
+
+ result = match(Foo(1), Foo, 'this matches', 'no match unfortunately')
+ self.assertEqual('this matches', result)