Minor cleanups.

README.rst

@@ -34,11 +34,11 @@ package is directly from GitHub,
 
 .. code:: sh
 
-    $ pip install --user git+https://github.com/anntzer/redeal
+    $ python -mpip install --user git+https://github.com/anntzer/redeal
 
 On Windows **only**, you can also download the ``.zip`` archive (from master,
-not from the releases), and run, from the folder containing the archive, ``pip
-install redeal-master.zip`` (or whatever name it has).
+not from the releases), and run, from the folder containing the archive,
+``python -mpip install redeal-master.zip`` (or whatever name it has).
 
 Directly running ``setup.py`` is **not** supported in either case.
 

examples/bbo_you_have_no_clue.py

@@ -5,7 +5,7 @@
 from redeal import *
 
 
-predeal = {"S": H("T8 8762 KT4 KQ52")}
+predeal = {"S": "T8 8762 KT4 KQ52"}
 
 
 def initial():

examples/bridgewinners_matchpoint_odds.py

@@ -21,9 +21,8 @@
 from redeal import *
 
 
-# The predealt cards (a dict with keys N, E, S, W).  `H` is a hand constructor
-# (if less than 13 cards are predealt, use "-" for the empty suits).
-predeal = {"S": H("652 K752 53 9862")}
+# The predealt cards (a dict with keys N, E, S, W; use "-" for voids).
+predeal = {"S": "652 K752 53 9862"}
 
 
 # `initial` is called at the beginning of the sim.  Here it initializes a

examples/deal2.py

@@ -7,7 +7,7 @@
 
 from redeal import *
 
-predeal = {"S": H("Q86432 T2 932 83")}
+predeal = {"S": "Q86432 T2 932 83"}
 
 def accept(deal):
     return deal.east.hcp > 18 and (deal.east.hcp > 22 or deal.east.losers < 2)

examples/deal3.py

@@ -13,7 +13,7 @@
 
 from redeal import *
 
-predeal = {"S": H("764 J4 J753 AQJ2")}
+predeal = {"S": "764 J4 J753 AQJ2"}
 
 def accept(deal):
     return (16 <= deal.west.hcp <= 19 and deal.west.shape in Shape("5(332)")

examples/deal_gambling.py

@@ -24,7 +24,7 @@ def gambling(holding):
         len(holding) >= 7 and A in holding and K in holding and Q in holding
         or len(holding) <= 4 and A not in holding and K not in holding)
 
-predeal = {"S": H("AK K52 98765 962"),
+predeal = {"S": "AK K52 98765 962",
            "N": SmartStack(GamblingShape, gambling, [4])}
 
 _shapes = Counter()

examples/opening_lead.py

@@ -1,14 +1,11 @@
 from redeal import *
 
-
-predeal = {"W": H("QT T32 JT8732 32")}
-
+predeal = {"W": "QT T32 JT8732 32"}
 
 def accept(deal):
     north, south = deal.north, deal.south
     return (south.shape in Shape("33(43)") + Shape("(32)(53)") and
             4 in (len(north.spades), len(north.hearts)) and
             15 <= south.hcp <= 17 and 9 <= north.hcp <= 11)
 
-
 simulation = OpeningLeadSim(accept, "3NS", imps)

redeal/redeal.py

@@ -233,13 +233,13 @@ def prepare(cls, predeal=None):
 
         There can be at most one ``SmartStack`` entry.
         """
-        predeal = {} if predeal is None else predeal.copy() or {}
+        predeal = {} if predeal is None else predeal.copy()
         dealer = {}
         seat_smartstack = None
         for seat in Seat:
             try:
                 pre = predeal.pop(str(seat)[0])
-            except:
+            except KeyError:
                 pre = predeal.pop(seat, Hand(()))
             if isinstance(pre, str):
                 dealer[seat] = H(pre).cards
@@ -268,8 +268,9 @@ def prepare(cls, predeal=None):
     def __new__(cls, dealer, accept_func=None, tries=1000):
         """Randomly deal a hand from a prepared dealer.
 
-        ``accept_func`` can be a function similar to ``Simulation.accept``
-        Reshuffles until ``accept_func`` returns true, but at most set number of ``tries``.
+        *accept_func* can be a function similar to `Simulation.accept`:
+        reshuffle until *accept_func* returns True, but no more than *tries*
+        times.
         """
         for i in range(tries):
             hands = [None] * len(Seat)