Merge pull request #424 from a1346054/fixes

Minor cleanup

.appveyor.yml

@@ -47,7 +47,7 @@ test_script:
   # Put your test command here.
   # Note that you must use the environment variable %PYTHON% to refer to
   # the interpreter you're using - Appveyor does not do anything special
-  # to put the Python evrsion you want to use on PATH.
+  # to put the Python version you want to use on PATH.
   - |
     misc\windows-build.cmd %PYTHON%\Scripts\tox.exe
 

NEWS.md

@@ -1,4 +1,3 @@
-
 User-visible changes in "magic-wormhole":
 
 ## Release 0.12.0 (04-Apr-2020)

docs/api.md

@@ -102,7 +102,7 @@ author. Application developers can use this one, or they can run their own
 (see the [warner/magic-wormhole-mailbox-server
 ](https://github.com/warner/magic-wormhole-mailbox-server) repository)
 and configure their clients to use it instead. The URL of the public
-rendevouz server is passed as a unicode string. Note that because the server
+rendezvous server is passed as a unicode string. Note that because the server
 actually speaks WebSockets, the URL starts with `ws:` instead of `http:`.
 
 ## Wormhole Parameters
@@ -699,4 +699,3 @@ w.send_message(msg) |                    |
 .                   | d=w.get_message()  | dg.wormhole_got_message(msg)
 w.close()           |                    | dg.wormhole_closed(result)
 .                   | d=w.close()        |
-

docs/attacks.md

@@ -59,7 +59,7 @@ ones that I've considered (but haven't implemented yet) include:
   would-be vandals from feeling a sense of accomplishment at writing
   their own :). Not sure it would help much, but I vaguely remember
   hearing about something similar in the early multi-user unix systems
-  (a publically-executable /bin/crash or something, which new users
+  (a publicly-executable /bin/crash or something, which new users
   tended to only run once before learning some responsibility).
 
 Using the secret words as part of the "channel id" isn't safe, since it

docs/client-protocol.md

@@ -62,5 +62,3 @@ message body will be the hex-encoded output of a NaCl `SecretBox`, keyed by a
 phase+side -specific key (computed with HKDF-SHA256, using the shared PAKE
 key as the secret input, and `wormhole:phase:%s%s % (SHA256(side),
 SHA256(phase))` as the CTXinfo), with a random nonce.
-
-

docs/conf.py

@@ -180,6 +180,3 @@ texinfo_documents = [
      author, 'Magic-Wormhole', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-

docs/introduction.md

@@ -2,7 +2,7 @@
 
 The magic-wormhole (Python) distribution provides several things: an
 executable tool ("bin/wormhole"), an importable library (`import wormhole`),
-the URL of a publically-available Rendezvous Server, and the definition of a
+the URL of a publicly-available Rendezvous Server, and the definition of a
 protocol used by all three.
 
 The executable tool provides basic sending and receiving of files,
@@ -53,4 +53,3 @@ describes this application's use of the client messages.
 Application use the `wormhole` library to establish wormhole connections and
 exchange data through them. Please see `api.md` for a complete description of
 this interface.
-

docs/state-machines/Makefile

@@ -1,7 +1,6 @@
-
 default: images
 
-images: allocator.png boss.png code.png input.png key.png lister.png machines.png mailbox.png nameplate.png order.png receive.png send.png terminator.png  dilation.png
+images: allocator.png boss.png code.png input.png key.png lister.png machines.png mailbox.png nameplate.png order.png receive.png send.png terminator.png dilation.png
 
 .PHONY: default images
 

docs/state-machines/allocator.dot

@@ -25,5 +25,5 @@ digraph {
         P_allocated -> S2 [color="orange"]
 
         S2 [label="S2:\ndone" color="orange"]
-        
+
 }

docs/state-machines/boss.dot

@@ -76,5 +76,4 @@ digraph {
                label="rx_welcome -> process (maybe rx_unwelcome)\nsend -> S.send\ngot_message -> got_version or got_phase\ngot_key -> W.got_key\ngot_verifier -> W.got_verifier\nallocate_code -> C.allocate_code\ninput_code -> C.input_code\nset_code -> C.set_code"
                ]
 
-
 }

docs/state-machines/mailbox.dot

@@ -94,5 +94,5 @@ digraph {
         S0B -> P3B_done [label="close" color="red"]
         S1A -> P3A_done [label="close" color="red"]
         S2A -> S3A [label="close" color="red"]
-        
+
 }

docs/state-machines/nameplate.dot

@@ -22,7 +22,7 @@ digraph {
         S1B -> S2B [style="invis"]
         {rank=same; S1A S1B}
         S1A -> S1B [style="invis"]
-        
+
         {rank=same; S2A P2_connected S2B}
         S2A [label="S2A:\nmaybe claimed"]
         S2A -> P2_connected [label="connected"]
@@ -96,6 +96,5 @@ digraph {
         S2B -> P3_release [label="close" color="red"]
         S3B -> P3_release [label="close" color="red"]
         S4B -> S4B [label="close" color="red"]
-        
 
 }

docs/state-machines/order.dot

@@ -21,7 +21,7 @@ digraph {
         P1_other [shape="box" label="R.got_message"]
         P1_other -> S1
 
-        
+
         /* the Mailbox will deliver each message exactly once, but doesn't
         guarantee ordering: if Alice starts the process, then disconnects,
         then Bob starts (reading PAKE, sending both his PAKE and his VERSION

docs/state-machines/send.dot

@@ -3,7 +3,7 @@ digraph {
 
         {rank=same; S0 P0_queue}
         {rank=same; S1 P1_send}
-        
+
         S0 [label="S0: unknown\nkey"]
         S0 -> P0_queue [label="send" style="dotted"]
         P0_queue [shape="box" label="queue" style="dotted"]

docs/state-machines/terminator.dot

@@ -19,7 +19,7 @@ digraph {
         Sno -> Sn [label="close"]
         Smo -> Sm [label="close" color="red"]
         S0o -> P_stop [label="close"]
-        
+
         Snm [label="Snm:\nnameplate active\nmailbox active\nclosing"
                      style="dashed"]
         Sn [label="Sn:\nnameplate active\nmailbox done\nclosing"
@@ -45,6 +45,5 @@ digraph {
 
         other [shape="box" style="dashed"
                label="close -> N.close, M.close"]
-               
 
 }

docs/tor.md

@@ -14,7 +14,7 @@ Just add ``--tor`` to use a running Tor daemon:
 
 ```
 wormhole send --tor myfile.jpg
- 
+
 wormhole receive --tor
 ```
 

docs/transit.md

@@ -164,7 +164,7 @@ be handled immediately. The complete example is here:
 ```python
 from twisted.internet.defer import inlineCallbacks
 from wormhole.transit import TransitSender
- 
+
 @inlineCallbacks
 def do_transit():
     s = TransitSender("tcp:relayhost.example.org:12345")

docs/w.dot

@@ -1,5 +1,5 @@
 digraph {
-        
+
         /*
         NM_start [label="Nameplate\nMachine" style="dotted"]
         NM_start -> NM_S_unclaimed [style="invis"]

docs/welcome.md

@@ -25,7 +25,7 @@ Sender:
 Sending 7924 byte file named 'README.md'
 On the other computer, please run: wormhole receive
 Wormhole code is: 7-crossover-clockwork
- 
+
 Sending (<-10.0.1.43:58988)..
 100%|=========================| 7.92K/7.92K [00:00<00:00, 6.02MB/s]
 File sent.. waiting for confirmation

misc/dump-timing.py

@@ -56,4 +56,3 @@ def web():
     reactor.callLater(0, launch_browser)
     reactor.run()
 web()
-

misc/web/timeline.js

@@ -1017,7 +1017,7 @@ function OFF() {
             .attr("stroke", "red")
         ;
 
-        
+
 
 
         // horizontal scale markers: vertical lines at rational timestamps

pyi/build-exe

@@ -14,4 +14,3 @@
 pyinstaller --clean --distpath=dist wormhole.exe.spec
 
 # result will be in dist/wormhole.exe
-

setup.cfg

@@ -5,7 +5,7 @@ universal = 1
 VCS = git
 versionfile_source = src/wormhole/_version.py
 versionfile_build = wormhole/_version.py
-tag_prefix = 
+tag_prefix =
 parentdir_prefix = magic-wormhole
 
 [flake8]

src/wormhole/_dilation/outbound.py

@@ -77,7 +77,7 @@ from .connection import KCM, Ping, Pong, Ack
 #     time.
 #   * If we're writing too slowly, we'll be left in the "unpaused" state: all
 #     Subchannel producers are unpaused, and the aggregate is unpaused too
-#     (resumeProducing is the last thing we've been told). In this satte,
+#     (resumeProducing is the last thing we've been told). In this state,
 #     activity is driven by the Subchannels doing a transport.write, which
 #     queues some data on the TCP connection (and then might call
 #     pauseProducing if it's now full).

src/wormhole/_wordlist.py

@@ -8,7 +8,7 @@ from zope.interface import implementer
 from ._interfaces import IWordlist
 
 # The PGP Word List, which maps bytes to phonetically-distinct words. There
-# are two lists, even and odd, and encodings should alternate between then to
+# are two lists, even and odd, and encodings should alternate between them to
 # detect dropped words. https://en.wikipedia.org/wiki/PGP_Words
 
 # Thanks to Warren Guy for transcribing them:

src/wormhole/errors.py

@@ -51,7 +51,7 @@ class WrongPasswordError(WormholeError):
     """
     Key confirmation failed. Either you or your correspondent typed the code
     wrong, or a would-be man-in-the-middle attacker guessed incorrectly. Try
-    sending the file again. 
+    sending the file again.
     """
     # or the data blob was corrupted, and that's why decrypt failed
     pass

src/wormhole/test/dilate/test_connect.py

@@ -88,5 +88,3 @@ class Connect(unittest.TestCase):
 
         yield t_left.d
         yield t_right.d
-
-

src/wormhole/test/dilate/test_manager.py

@@ -624,4 +624,3 @@ class TestManager(unittest.TestCase):
         self.flushLoggedErrors(UnknownDilationMessageType)
 
     # TODO: test transit relay is used
-