Improve mapping recognition

diff --git a/pypol/coordinates.py b/pypol/coordinates.py
index 69d498e..78e8d4a 100644 (file)
--- a/pypol/coordinates.py
+++ b/pypol/coordinates.py
@@ -3,7 +3,7 @@ import numbers
 import operator
 
 from abc import ABC, abstractmethod
 import operator
 
 from abc import ABC, abstractmethod

-from collections import OrderedDict
+from collections import OrderedDict, Mapping

 
 from .linexprs import Symbol
 
 
 from .linexprs import Symbol
 


@@ -75,7 +75,7 @@ class Point(Coordinates):
     """
 
     def __new__(cls, coordinates=None):
     """
 
     def __new__(cls, coordinates=None):

-        if isinstance(coordinates, dict):
+        if isinstance(coordinates, Mapping):

             coordinates = coordinates.items()
         self = object().__new__(cls)
         self._coordinates = OrderedDict()
             coordinates = coordinates.items()
         self = object().__new__(cls)
         self._coordinates = OrderedDict()

diff --git a/pypol/linexprs.py b/pypol/linexprs.py
index a9f188b..5ec5efd 100644 (file)
--- a/pypol/linexprs.py
+++ b/pypol/linexprs.py
@@ -3,7 +3,7 @@ import functools
 import numbers
 import re
 
 import numbers
 import re
 

-from collections import OrderedDict, defaultdict
+from collections import OrderedDict, defaultdict, Mapping

 from fractions import Fraction, gcd
 
 
 from fractions import Fraction, gcd
 
 


@@ -45,7 +45,7 @@ class Expression:
             return Expression.fromstring(coefficients)
         if coefficients is None:
             return Rational(constant)
             return Expression.fromstring(coefficients)
         if coefficients is None:
             return Rational(constant)

-        if isinstance(coefficients, dict):
+        if isinstance(coefficients, Mapping):

             coefficients = coefficients.items()
         for symbol, coefficient in coefficients:
             if not isinstance(symbol, Symbol):
             coefficients = coefficients.items()
         for symbol, coefficient in coefficients:
             if not isinstance(symbol, Symbol):


@@ -218,7 +218,7 @@ class Expression:
 
     def subs(self, symbol, expression=None):
         if expression is None:
 
     def subs(self, symbol, expression=None):
         if expression is None:

-            if isinstance(symbol, dict):
+            if isinstance(symbol, Mapping):

                 symbol = symbol.items()
             substitutions = symbol
         else:
                 symbol = symbol.items()
             substitutions = symbol
         else: