update from Atlas with major reorg

Author: ramalho

.gitignore

@@ -4,6 +4,7 @@ concurrency/charfinder/charfinder_index.pickle
 metaprog/oscon-schedule/data/schedule?_db
 concurrency/wikipedia/fixture/docroot/
 17-futures/countries/flags/
+attic/futures/countries/flags/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

support/container_perftest.py renamed to 03-dict-set/support/container_perftest.py

@@ -2,12 +2,13 @@
 # BEGIN BINGO_DEMO
 
 >>> bingo = BingoCage(range(3))
->>> bingo()
-2
+>>> bingo.pick()
+1
 >>> bingo()
 0
 >>> callable(bingo)
 True
+
 # END BINGO_DEMO
 
 """
@@ -22,9 +23,13 @@ def __init__(self, items):
         self._items = list(items)  # <1>
         random.shuffle(self._items)  # <2>
 
-    def __call__(self):
-        if not self._items:  # <3>
-            raise IndexError('pop from empty BingoCage')
-        return self._items.pop()
+    def pick(self):  # <3>
+        try:
+            return self._items.pop()
+        except IndexError:
+            raise LookupError('pick from empty BingoCage')  # <4>
+
+    def __call__(self):  # <5>
+        return self.pick()
 
 # END BINGO

support/container_perftest_datagen.py renamed to 03-dict-set/support/container_perftest_datagen.py

@@ -0,0 +1,43 @@
+# clockdeco_param.py
+
+"""
+>>> snooze(.1)  # doctest: +ELLIPSIS
+[0.101...s] snooze(0.1) -> None
+>>> clock('{name}: {elapsed}')(time.sleep)(.2)  # doctest: +ELLIPSIS
+sleep: 0.20...
+>>> clock('{name}({args}) dt={elapsed:0.3f}s')(time.sleep)(.2)
+sleep(0.2) dt=0.201s
+"""
+
+# BEGIN CLOCKDECO_CLS
+import time
+
+DEFAULT_FMT = '[{elapsed:0.8f}s] {name}({args}) -> {result}'
+
+class clock:
+
+    def __init__(self, fmt=DEFAULT_FMT):
+        self.fmt = fmt
+
+    def __call__(self, func):
+        def clocked(*_args):
+            t0 = time.time()
+            _result = func(*_args)
+            elapsed = time.time() - t0
+            name = func.__name__
+            args = ', '.join(repr(arg) for arg in _args)
+            result = repr(_result)
+            print(self.fmt.format(**locals()))
+            return _result
+        return clocked
+
+if __name__ == '__main__':
+
+    @clock()
+    def snooze(seconds):
+        time.sleep(seconds)
+
+    for i in range(3):
+        snooze(.123)
+
+# END CLOCKDECO_CLS

support/hashdiff.py renamed to 03-dict-set/support/hashdiff.py

@@ -1,3 +1,5 @@
+# BEGIN TOMBOLA_BINGO
+
 import random
 
 from tombola import Tombola
@@ -6,14 +8,21 @@
 class BingoCage(Tombola):  # <1>
 
     def __init__(self, items):
-        self._balls = list(items)  # <2>
+        self._randomizer = random.SystemRandom()  # <2>
+        self._items = []
+        self.load(items)  # <3>
 
     def load(self, items):
-        self._balls.extend(items)
+        self._items.extend(items)
+        self._randomizer.shuffle(self._items)  # <4>
 
-    def pick(self):
+    def pick(self):  # <5>
         try:
-            position = random.randrange(len(self._balls))  # <3>
-        except ValueError:
-            raise LookupError('pop from empty BingoCage')
-        return self._balls.pop(position)  # <4>
+            return self._items.pop()
+        except IndexError:
+            raise LookupError('pick from empty BingoCage')
+
+    def __call__(self):  # <7>
+        self.pick()
+
+# END TOMBOLA_BINGO

05-1class-func/bingo.py renamed to 05-1class-func/bingocall.py

@@ -1,3 +1,5 @@
+# BEGIN LOTTERY_BLOWER
+
 import random
 
 from tombola import Tombola
@@ -6,19 +8,23 @@
 class LotteryBlower(Tombola):
 
     def __init__(self, iterable):
-        self.randomizer = random.SystemRandom()  # <1>
-        self.clear()
-        self.load(iterable)
-
-    def clear(self):
-        self._balls = []
+        self._balls = list(iterable)  # <1>
 
     def load(self, iterable):
         self._balls.extend(iterable)
-        self.randomizer.shuffle(self._balls)  # <2>
 
     def pick(self):
-        return self._balls.pop()  # <3>
+        try:
+            position = random.randrange(len(self._balls))  # <2>
+        except ValueError:
+            raise LookupError('pick from empty BingoCage')
+        return self._balls.pop(position)  # <3>
 
     def loaded(self):  # <4>
-        return len(self._balls) > 0
+        return bool(self._balls)
+
+    def inspect(self):  # <5>
+        return tuple(sorted(self._balls))
+
+
+# END LOTTERY_BLOWER

attic/decorators/clockdeco.py renamed to 07-closure-deco/clockdeco.py

@@ -1,3 +1,5 @@
+# BEGIN TOMBOLA_ABC
+
 import abc
 
 class Tombola(abc.ABC):  # <1>
@@ -14,10 +16,20 @@ def pick(self):  # <3>
         """
 
     def loaded(self):  # <4>
-        try:
-            item = self.pick()
-        except LookupError:
-            return False
-        else:
-            self.load([item])  # put it back
-            return True
+        """Return `True` if there's at least 1 item, `False` otherwise."""
+        return bool(self.inspect())  # <5>
+
+
+    def inspect(self):
+        """Return a sorted tuple with the items currently inside."""
+        items = []
+        while True:  # <6>
+            try:
+                items.append(self.pick())
+            except LookupError:
+                break
+        self.load(items)  # <7>
+        return tuple(sorted(items))
+
+
+# END TOMBOLA_ABC

07-closure-deco/clockdeco_cls.py

@@ -11,6 +11,8 @@ Create and load instance from iterable::
     >>> globe = ConcreteTombola(balls)
     >>> globe.loaded()
     True
+    >>> globe.inspect()
+    (0, 1, 2)
 
 
 Pick and collect balls::
@@ -55,7 +57,7 @@ Load and pick 100 balls to verify that they all come out::
     >>> balls = list(range(100))
     >>> globe = ConcreteTombola(balls)
     >>> picks = []
-    >>> while globe.loaded():
+    >>> while globe.inspect():
     ...     picks.append(globe.pick())
     >>> len(picks) == len(balls)
     True
@@ -72,7 +74,7 @@ Check that the order has changed and is not simply reversed::
 
 Note: the previous 2 tests have a *very* small chance of failing
 even if the implementation is OK. The probability of the 100
-balls coming out, by chance, in the order they were loaded is
+balls coming out, by chance, in the order they were inspect is
 1/100!, or approximately 1.07e-158. It's much easier to win the
 Lotto or to become a billionaire working as a programmer.
 

11-iface-abc/bingo.py

@@ -12,8 +12,12 @@ def pick(self):
         else:
             raise LookupError('pop from empty TomboList')
 
-    def load(self, iterable): self.extend(iterable)  # <5>
+    load = list.extend  # <5>
 
-    def loaded(self): return bool(self)  # <6>
+    def loaded(self):
+        return bool(self)  # <6>
 
-# Tombola.register(TomboList)  # <- Python 3.2 or earlier
+    def inspect(self):
+        return tuple(sorted(self))
+
+# Tombola.register(TomboList)  # <7>

interfaces/drum.py renamed to 11-iface-abc/drum.py

@@ -0,0 +1,28 @@
+# BEGIN TOMBOLA_BINGO
+
+import random
+
+from tombola import Tombola
+
+
+class BingoCage(Tombola):  # <1>
+
+    def __init__(self, items):
+        self._randomizer = random.SystemRandom()  # <2>
+        self._items = []
+        self.load(items)  # <3>
+
+    def load(self, items):
+        self._items.extend(items)
+        self._randomizer.shuffle(self._items)  # <4>
+
+    def pick(self):  # <5>
+        try:
+            return self._items.pop()
+        except IndexError:
+            raise LookupError('pick from empty BingoCage')
+
+    def __call__(self):  # <7>
+        self.pick()
+
+# END TOMBOLA_BINGO

11-iface-abc/lotto.py

@@ -4,56 +4,83 @@
 ======================
 
 
-Tests for __add__ and __iadd__:
+Tests for __add__:
+
+# BEGIN ADDABLE_BINGO_ADD_DEMO
 
     >>> vowels = 'AEIOU'
-    >>> globe = AddableBingoCage(vowels)
-    >>> len(globe)
-    5
-    >>> globe.pop() in vowels
+    >>> globe = AddableBingoCage(vowels)  # <1>
+    >>> globe.inspect()
+    ('A', 'E', 'I', 'O', 'U')
+    >>> globe.pick() in vowels  # <2>
     True
-    >>> len(globe)
+    >>> len(globe.inspect())  # <3>
     4
-    >>> globe2 = AddableBingoCage('XYZ')
+    >>> globe2 = AddableBingoCage('XYZ')  # <4>
     >>> globe3 = globe + globe2
-    >>> len(globe3)
+    >>> len(globe3.inspect())  # <5>
     7
-    >>> void = globe + [10, 20]
+    >>> void = globe + [10, 20]  # <6>
     Traceback (most recent call last):
       ...
     TypeError: unsupported operand type(s) for +: 'AddableBingoCage' and 'list'
 
 
-Tests for __add__ and __iadd__:
+# END ADDABLE_BINGO_ADD_DEMO
+
+Tests for __iadd__:
+
+# BEGIN ADDABLE_BINGO_IADD_DEMO
 
-    >>> globe_orig = globe
-    >>> len(globe)
+    >>> globe_orig = globe  # <1>
+    >>> len(globe.inspect())  # <2>
     4
-    >>> globe += globe2
-    >>> len(globe)
+    >>> globe += globe2  # <3>
+    >>> len(globe.inspect())
     7
-    >>> globe += [10, 20]
-    >>> len(globe)
+    >>> globe += ['M', 'N']  # <4>
+    >>> len(globe.inspect())
     9
-    >>> globe is globe_orig
+    >>> globe is globe_orig  # <5>
     True
+    >>> globe += 1  # <6>
+    Traceback (most recent call last):
+      ...
+    TypeError: right operand in += must be 'AddableBingoCage' or an iterable
+
+# END ADDABLE_BINGO_IADD_DEMO
 
 """
 
 # BEGIN ADDABLE_BINGO
 import itertools  # <1>
-from bingobase import BingoCage
+
+from tombola import Tombola
+from bingo import BingoCage
 
 
 class AddableBingoCage(BingoCage):  # <2>
 
     def __add__(self, other):
-        if isinstance(other, AddableBingoCage):  # <3>
-            return AddableBingoCage(itertools.chain(self, other))  # <4>
+        if isinstance(other, Tombola):  # <3>
+            return AddableBingoCage(self.inspect() + other.inspect())  # <6>
         else:
             return NotImplemented
 
     def __iadd__(self, other):
-        self.load(other)  # <5>
-        return self  # <6>
+        if isinstance(other, Tombola):
+            other_iterable = other.inspect()  # <4>
+        else:
+            try:
+                other_iterable = iter(other)  # <5>
+            except TypeError:  # <6>
+                self_cls = type(self).__name__
+                msg = "right operand in += must be {!r} or an iterable"
+                raise TypeError(msg.format(self_cls))
+        self.load(other_iterable)  # <7>
+        return self  # <8>
+
+
+
+
 # END ADDABLE_BINGO