Merge remote-tracking branch 'origin/master'

Author: 4tochka

pybtc/transaction.py

@@ -468,7 +468,7 @@ def add_input(self, tx_id=None, v_out=0, sequence=0xffffffff,
         if amount:
             self["vIn"][k]["value"] = amount
         if private_key:
-            self["vIn"][k].private_key = private_key
+            self["vIn"][k]["private_key"] = private_key
         if self.auto_commit:
             self.commit()
         return self
@@ -564,7 +564,7 @@ def sign_input(self, n, private_key=None, script_pub_key=None,
         # private key
         if not private_key:
             try:
-                private_key = self["vIn"][n].private_key.key
+                private_key = self["vIn"][n]["private_key"].key
             except:
                 raise RuntimeError("no private key")
         if isinstance(private_key, list):