Pull in most recent master

Author: kclowes

web3/providers/ipc.py

@@ -85,7 +85,7 @@ def get_default_ipc_path():
         if os.path.exists(ipc_path):
             return ipc_path
 
-        base_trinity_path = Path('~').expanduser() / '.local' / 'share' / 'trinity'
+        base_trinity_path = pathlib.Path('~').expanduser() / '.local' / 'share' / 'trinity'
         ipc_path = base_trinity_path / 'mainnet' / 'jsonrpc.ipc'
         if ipc_path.exists():
             return str(ipc_path)
@@ -109,7 +109,7 @@ def get_default_ipc_path():
         if os.path.exists(ipc_path):
             return ipc_path
 
-        base_trinity_path = Path('~').expanduser() / '.local' / 'share' / 'trinity'
+        base_trinity_path = pathlib.Path('~').expanduser() / '.local' / 'share' / 'trinity'
         ipc_path = base_trinity_path / 'mainnet' / 'jsonrpc.ipc'
         if ipc_path.exists():
             return str(ipc_path)