Merge branch 'master' into viewtags

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.2
+current_version = 1.0.3
 parse = (?P<major>\d+)\.(?P<minor>\d+)(?:\.(?P<patch>\d+))?
 serialize = 
 	{major}.{minor}.{patch}

README.rst

@@ -20,7 +20,7 @@ Python Monero module
 
 A comprehensive Python module for handling Monero cryptocurrency.
 
-* release 1.0.2
+* release 1.0.3
 * open source: https://github.com/monero-ecosystem/monero-python
 * works with Monero 0.17.x and `the latest source`_ (at least we try to keep up)
 * Python 2.x and 3.x compatible

docs/source/conf.py

@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath("../.."))
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
-# needs_sphinx = '1.0.2'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -56,9 +56,9 @@ author = "Michal Salaban"
 # built documents.
 #
 # The short X.Y version.
-version = "1.0.2"
+version = "1.0.3"
 # The full version, including alpha/beta/rc tags.
-release = "1.0.2"
+release = "1.0.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

monero/__init__.py

@@ -1,3 +1,3 @@
 from . import address, account, const, daemon, wallet, numbers, wordlists, seed
 
-__version__ = "1.0.2"
+__version__ = "1.0.3"

monero/backends/jsonrpc/daemon.py

@@ -1440,8 +1440,8 @@ class JSONRPCDaemon(object):
         """
 
         if out_peers_arg < 0:
-            out_peers_arg = 2 ** 32 - 1
-        elif out_peers_arg > 2 ** 32 - 1:
+            out_peers_arg = 2**32 - 1
+        elif out_peers_arg > 2**32 - 1:
             raise ValueError('out_peers_arg "{}" is too large'.format(out_peers_arg))
 
         return self.raw_request("/out_peers", data={"out_peers": int(out_peers_arg)})
@@ -1459,8 +1459,8 @@ class JSONRPCDaemon(object):
         """
 
         if in_peers_arg < 0:
-            in_peers_arg = 2 ** 32 - 1
-        elif in_peers_arg > 2 ** 32 - 1:
+            in_peers_arg = 2**32 - 1
+        elif in_peers_arg > 2**32 - 1:
             raise ValueError('in_peers_arg "{}" is too large'.format(in_peers_arg))
 
         return self.raw_request("/in_peers", data={"in_peers": int(in_peers_arg)})
@@ -1598,7 +1598,9 @@ class JSONRPCDaemon(object):
                     timestamp=datetime.fromtimestamp(tx["block_timestamp"])
                     if "block_timestamp" in tx
                     else None,
-                    output_indices=tx["output_indices"],
+                    output_indices=tx["output_indices"]
+                    if "output_indices" in tx
+                    else None,
                     blob=binascii.unhexlify(tx["as_hex"]) or None,
                     json=as_json,
                 )

monero/backends/jsonrpc/wallet.py

@@ -440,6 +440,6 @@ _err2exc = {
     -29: exceptions.WalletIsWatchOnly,
     -37: exceptions.NotEnoughUnlockedMoney,
     -38: exceptions.NoDaemonConnection,
-    -43: exceptions.WalletIsNotDeterministic,  # https://github.com/monero-project/monero/pull/4653
+    -43: exceptions.WalletIsNotDeterministic,
     -32601: MethodNotFound,
 }