Browse Source

move AsyncInit to base_obj.py

The MMGen Project 3 years ago
parent
commit
b877e865bb
6 changed files with 11 additions and 8 deletions
  1. 1 0
      mmgen/addr.py
  2. 2 1
      mmgen/altcoins/eth/contract.py
  3. 6 0
      mmgen/base_obj.py
  4. 0 6
      mmgen/obj.py
  5. 1 1
      mmgen/rpc.py
  6. 1 0
      mmgen/tw.py

+ 1 - 0
mmgen/addr.py

@@ -22,6 +22,7 @@ addr.py:  Address generation/display routines for the MMGen suite
 
 
 from hashlib import sha256,sha512
 from hashlib import sha256,sha512
 from .common import *
 from .common import *
+from .base_obj import AsyncInit
 from .obj import *
 from .obj import *
 from .baseconv import *
 from .baseconv import *
 from .protocol import init_proto,hash160
 from .protocol import init_proto,hash160

+ 2 - 1
mmgen/altcoins/eth/contract.py

@@ -25,7 +25,8 @@ from . import rlp
 
 
 from mmgen.globalvars import g
 from mmgen.globalvars import g
 from mmgen.common import *
 from mmgen.common import *
-from mmgen.obj import MMGenObject,CoinAddr,TokenAddr,CoinTxID,AsyncInit
+from mmgen.base_obj import AsyncInit
+from mmgen.obj import MMGenObject,CoinAddr,TokenAddr,CoinTxID
 from mmgen.util import msg
 from mmgen.util import msg
 from .obj import ETHAmt
 from .obj import ETHAmt
 
 

+ 6 - 0
mmgen/base_obj.py

@@ -20,6 +20,12 @@
 base_obj.py: base objects with no internal imports for the MMGen suite
 base_obj.py: base objects with no internal imports for the MMGen suite
 """
 """
 
 
+class AsyncInit(type):
+	async def __call__(cls,*args,**kwargs):
+		instance = cls.__new__(cls,*args,**kwargs)
+		await type(instance).__init__(instance,*args,**kwargs)
+		return instance
+
 class AttrCtrlMeta(type):
 class AttrCtrlMeta(type):
 	def __call__(cls,*args,**kwargs):
 	def __call__(cls,*args,**kwargs):
 		instance = super().__call__(*args,**kwargs)
 		instance = super().__call__(*args,**kwargs)

+ 0 - 6
mmgen/obj.py

@@ -28,12 +28,6 @@ from .exception import *
 from .globalvars import *
 from .globalvars import *
 from .color import *
 from .color import *
 
 
-class AsyncInit(type):
-	async def __call__(cls,*args,**kwargs):
-		instance = cls.__new__(cls,*args,**kwargs)
-		await type(instance).__init__(instance,*args,**kwargs)
-		return instance
-
 def get_obj(objname,*args,**kwargs):
 def get_obj(objname,*args,**kwargs):
 	"""
 	"""
 	Wrapper for data objects
 	Wrapper for data objects

+ 1 - 1
mmgen/rpc.py

@@ -23,7 +23,7 @@ rpc.py:  Cryptocoin RPC library for the MMGen suite
 import base64,json,asyncio
 import base64,json,asyncio
 from decimal import Decimal
 from decimal import Decimal
 from .common import *
 from .common import *
-from .obj import AsyncInit
+from .base_obj import AsyncInit
 
 
 rpc_credentials_msg = '\n'+fmt("""
 rpc_credentials_msg = '\n'+fmt("""
 	Error: no {proto_name} RPC authentication method found
 	Error: no {proto_name} RPC authentication method found

+ 1 - 0
mmgen/tw.py

@@ -24,6 +24,7 @@ import json
 from collections import namedtuple
 from collections import namedtuple
 from .exception import *
 from .exception import *
 from .common import *
 from .common import *
+from .base_obj import AsyncInit
 from .obj import *
 from .obj import *
 from .tx import is_mmgen_id,is_coin_addr
 from .tx import is_mmgen_id,is_coin_addr
 from .rpc import rpc_init
 from .rpc import rpc_init