Merge #223: Fix typo: P2WSH -> P2WPKH

6e9e31e fix typo: P2WSH -> P2WPKH (Bryan Bishop)

Pull request description:

  Fix a minor typo in a docstring.

Top commit has no ACKs.

Tree-SHA512: a88181b4e906cf44479c575fff4bae6786160a61ba0f54dec23f3cb4cdfd65ee7f29b4faa4f365da8119527ab9c77fbfdd506220456b8f680192637ac6ea48d6

Author: kanzure

bitcoin/wallet.py

@@ -315,7 +315,7 @@ class P2WPKHBitcoinAddress(CBech32BitcoinAddress):
 
     @classmethod
     def from_scriptPubKey(cls, scriptPubKey):
-        """Convert a scriptPubKey to a P2WSH address
+        """Convert a scriptPubKey to a P2WPKH address
 
         Raises CBitcoinAddressError if the scriptPubKey isn't of the correct
         form.