Merge 3d3694c into 0e82370

ionelmc · Jan 14, 2019 · 3a95619 · 3a95619
2 parents 0e82370 + 3d3694c
commit 3a95619
Show file tree

Hide file tree

Showing 11 changed files with 9,105 additions and 5,469 deletions.
diff --git a/src/hunter/__init__.py b/src/hunter/__init__.py
@@ -17,28 +17,31 @@
 
 try:
     if os.environ.get("PUREPYTHONHUNTER"):
-        raise ImportError("Skipped")
+        raise ImportError("Cython speedups are disabled")
 
     from ._predicates import And as _And
+    from ._predicates import From
     from ._predicates import Not
     from ._predicates import Or as _Or
     from ._predicates import When
     from ._predicates import Query
     from ._tracer import Tracer
 except ImportError:
     from .predicates import And as _And
+    from .predicates import From
     from .predicates import Not
     from .predicates import Or as _Or
     from .predicates import When
     from .predicates import Query
     from .tracer import Tracer
 
-__version__ = "__version__ = '2.1.0'"
+__version__ = '2.1.0'
 __all__ = (
     'And',
     'CallPrinter',
     'CodePrinter',
     'Debugger',
+    'From',
     'Manhole',
     'Not',
     'Or',

diff --git a/src/hunter/_event.c b/src/hunter/_event.c