diff --git a/CHANGELOG.md b/CHANGELOG.md index bcbad5a275e8cb5bef2a80182ffaa80008e2a5f8..9a051da158c8731b161b4ae6425af18bae011c2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Pomniejsze usprawnienia do TimerHeap * Dodano `self` do @typed +* Dodano typ `Number` do @typed ## v2.0.11 diff --git a/satella/coding/__init__.py b/satella/coding/__init__.py index 57c8d81ad5379970cced2699d49cf4ed345cdf7f..8fac10666bf2d0b8c3df99f8cd2f459b4adf4319 100644 --- a/satella/coding/__init__.py +++ b/satella/coding/__init__.py @@ -5,7 +5,7 @@ Just useful objects to make your coding nicer every day from __future__ import print_function, absolute_import, division from .typecheck import typed, List, Tuple, Dict, NewType, Callable, Sequence, \ - TypeVar, Generic, Mapping, Iterable, Union, Any, Optional, CallSignature + TypeVar, Generic, Mapping, Iterable, Union, Any, Optional, CallSignature, Number from .structures import TimeBasedHeap, CallableGroup, Heap from .monitor import Monitor, RMonitor @@ -15,5 +15,5 @@ __all__ = [ 'TimeBasedHeap', 'Heap', 'CallableGroup', 'Monitor', 'RMonitor', 'merge_dicts', 'typed', 'List', 'Tuple', 'Dict', 'NewType', 'Callable', 'Sequence', - 'TypeVar', 'Generic', 'Mapping', 'Iterable', 'Union', 'Any', 'Optional', 'CallSignature' + 'TypeVar', 'Generic', 'Mapping', 'Iterable', 'Union', 'Any', 'Optional', 'CallSignature', 'Number' ] diff --git a/satella/coding/typecheck.py b/satella/coding/typecheck.py index ddbb9e1e17ea9ef01fa61eada6ba8797bc01a8d8..f35c03ad301254d27bf9018f027a10d37499a5b2 100644 --- a/satella/coding/typecheck.py +++ b/satella/coding/typecheck.py @@ -23,6 +23,7 @@ Dict = typing.Dict NewType = typing.NewType Callable = typing.Callable Sequence = typing.Sequence +Number = six.integer_types + (float, ) TypeVar = typing.TypeVar Generic = typing.Generic Mapping = typing.Mapping diff --git a/setup.py b/setup.py index 395c0cae6bda2fe9ed29f6dc2856668cd45bf38a..e772246439381e44eb4ab68bb1505573bd8a93b0 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup(name='satella', - version='2.0.12rc2', + version='2.0.12rc3', description=u'Utilities for writing servers in Python', author=u'Piotr MaĹlanka', author_email='piotrm@smok.co', diff --git a/tests/test_coding/test_debug.py b/tests/test_coding/test_debug.py index e5febb19bd93e782e2469f66d46c4b37833f7f1c..10d2d20914499be61f6119cf28515dffe5ad2caa 100644 --- a/tests/test_coding/test_debug.py +++ b/tests/test_coding/test_debug.py @@ -2,7 +2,7 @@ from __future__ import print_function, absolute_import, division import six import unittest -from satella.coding import typed, CallSignature +from satella.coding import typed, CallSignature, Number class TestTypecheck(unittest.TestCase): @@ -100,11 +100,11 @@ class TestTypecheck(unittest.TestCase): def test_self(self): class Wtf(object): - @typed('self', int, int, returns=int) + @typed('self', Number, Number, returns=Number) def add(self, a, b): return a+b - Wtf().add(1,2) + Wtf().add(1,2.5) def test_T2(self):