all tested: Windows, Ubuntu

Author: stefanzarembinski

contracts/eosio_token/src/eosio_token.cpp

@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosio_token.hpp>
+#include "include/eosio_token.hpp"
 
 namespace eosio {
 

contracts/tic_tac_toe/src/tic_tac_toe.cpp

@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <tic_tac_toe.hpp>
+#include "include/tic_tac_toe.hpp"
 
 namespace eosio {
 

docs/comments/symbolic_names.md

@@ -15,6 +15,7 @@ $ python3
 ```
 
 ```python
+import eosfactory.core.setup as setup
 from eosfactory.eosf import *
 ```
 

docs/comments/symbolic_names.py

@@ -1,4 +1,5 @@
 
+import eosfactory.core.setup as setup
 from eosfactory.eosf import *
 
 reset()

eosfactory/clear_easy_install_pth.py

@@ -6,15 +6,15 @@
 import eosfactory.core.manager as manager
 import eosfactory.core.logger as logger
 
+
 class Eosio(interface.Account):
-    def __init__(self, account_object_name):    
-        self.name = "eosio"
-        self.account_object_name = account_object_name        
-        self.owner_key = cleos.CreateKey(
+    def __init__(self, account_object_name):
+        interface.Account.__init__(self, "eosio",
+        cleos.CreateKey(
             config.eosio_key_public(),
             config.eosio_key_private()
-            )
-        self.active_key = self.owner_key
+            ))
+        self.account_object_name = account_object_name
 
     def info(self):
         msg = manager.accout_names_2_object_names(
@@ -36,7 +36,7 @@ class GetAccount(cleos.GetAccount):
     def __init__(
             self,
             account_object_name, name=None, 
-            owner_key=None, active_key=None, verbosity=None):
+            owner_key=None, active_key=None):
 
         self.account_object_name = account_object_name
         if name is None: 
@@ -91,7 +91,7 @@ def __str__(self):
 
 
 class RestoreAccount(cleos.RestoreAccount):
-    def __init__(self, name, verbosity=None):
+    def __init__(self, name):
         cleos.RestoreAccount.__init__(self, name, is_verbose=False)
 
 
@@ -107,8 +107,7 @@ def __init__(
             max_cpu_usage=0,
             max_net_usage=0,
             ref_block=None,
-            delay_sec=0,
-            verbosity=None):
+            delay_sec=0):
         cleos.CreateAccount.__init__(
             self, creator, name, owner_key, active_key, permission,
             expiration_sec, skip_sign, dont_broadcast, force_unique,
@@ -127,8 +126,7 @@ def __init__(
             expiration_sec=None, 
             skip_sign=0, dont_broadcast=0, force_unique=0,
             max_cpu_usage=0, max_net_usage=0,
-            ref_block=None,
-            verbosity=None):
+            ref_block=None):
 
         cleos_sys.SystemNewaccount.__init__(
             self, creator, name, owner_key, active_key,

eosfactory/core/account.py

@@ -211,8 +211,8 @@ def __init__(self, account, is_info=True, is_verbose=True):
                         if permission["perm_name"] == "active":
                             self.active_key = key                   
             else:
-                owner = re.search('owner\s+1\:\s+1\s(.*)\n', self.out_msg)
-                active = re.search('active\s+1\:\s+1\s(.*)\n', self.out_msg)
+                owner = re.search(r'owner\s+1\:\s+1\s(.*)\n', self.out_msg)
+                active = re.search(r'active\s+1\:\s+1\s(.*)\n', self.out_msg)
                 if owner and active:
                     self.owner_key = owner.group(1)
                     self.active_key = active.group(1)

eosfactory/core/cleos.py

@@ -1,8 +1,6 @@
 import re
-import types
 
 import eosfactory.core.errors as errors
-import eosfactory.core.logger as logger
 import eosfactory.core.manager as manager
 import eosfactory.core.interface as interface
 import eosfactory.core.cleos as cleos
@@ -45,7 +43,6 @@ def __init__(
             Cannot determine the contract directory. The clue is 
             {}.
             """.format(contract_dir))
-            return
 
         contract_path_absolute = files[0]
         wasm_file = files[1]
@@ -182,6 +179,8 @@ def __init__(
             args.append("--dont-broadcast")
         if force_unique:
             args.append("--force-unique")
+        if return_packed:
+            args.append("--return-packed")
         if max_cpu_usage:
             args.extend(["--max-cpu-usage-ms", str(max_cpu_usage)])
         if  max_net_usage:
@@ -212,7 +211,7 @@ class SetActionPermission(cleos.Cleos):
             permission authority for.
         code (str or .interface.Account): The account that owns the code for \
             the action.
-        type (str): The type of the action.
+        action_type (str): The type of the action.
         requirement (str): The permission name require for executing the given 
             action.
 
@@ -227,7 +226,7 @@ class SetActionPermission(cleos.Cleos):
             component of EOSIO cleos responce.
     '''
     def __init__(
-            self, account, code, type, requirement,
+            self, account, code, action_type, requirement,
             permission=None,
             expiration_sec=None, 
             skip_sign=0, dont_broadcast=0, return_packed=0, force_unique=0,
@@ -242,7 +241,7 @@ def __init__(
         code_name = interface.account_arg(code)
         args.append(code_name)
 
-        args.append(type)
+        args.append(action_type)
 
         if requirement:
             requirement_name = interface.account_arg(requirement)
@@ -265,6 +264,8 @@ def __init__(
             args.append("--dont-broadcast")
         if force_unique:
             args.append("--force-unique")
+        if return_packed:
+            args.append("--return-packed")
         if max_cpu_usage:
             args.extend(["--max-cpu-usage-ms", str(max_cpu_usage)])
         if  max_net_usage:
@@ -274,7 +275,7 @@ def __init__(
         if delay_sec:
             args.extend(["--delay-sec", str(delay_sec)])
 
-        self = cleos.Cleos(args, "set", "action permission", is_verbose)
+        cleos.Cleos.__init__(self, args, "set", "action permission", is_verbose)
         self.console = None
         self.data = None
 

eosfactory/core/cleos_set.py

@@ -1,5 +1,4 @@
 import eosfactory.core.cleos as cleos
-import eosfactory.core.setup as setup
 import eosfactory.core.interface as interface
 
 def reload():
@@ -47,7 +46,7 @@ def __init__(
         stake_cpu = "{} EOS".format(stake_cpu)
 
         if name is None: 
-            name = account_name()
+            name = cleos.account_name()
         interface.Account.__init__(self, name)
 
         self.owner_key = None # private keys
@@ -76,6 +75,8 @@ def __init__(
             p = interface.permission_arg(permission)
             for perm in p:
                 args.extend(["--permission", perm])
+        if expiration_sec:
+            args.extend(["--expiration", str(expiration_sec)])
         if skip_sign:
             args.append("--skip-sign")
         if dont_broadcast:
@@ -136,6 +137,8 @@ def __init__(
 
         if buy_ram_kbytes:
             args.extend(["--kbytes"])
+        if expiration_sec:
+            args.extend(["--expiration", str(expiration_sec)])
         if skip_sign:
             args.append("--skip-sign")
         if dont_broadcast:

eosfactory/core/cleos_sys.py

@@ -1,6 +1,5 @@
 import re
 import sys
-import inspect
 
 import eosfactory.core.logger as logger
 import eosfactory.core.interface as interface
@@ -16,8 +15,8 @@ def validate(omittable):
     if "unknown key" in err_msg:
         raise AccountDoesNotExistError(omittable)
     elif "Error 3080001: Account using more than allotted RAM" in err_msg:
-        needs = int(re.search('needs\s(.*)\sbytes\shas', err_msg).group(1))
-        has = int(re.search('bytes\shas\s(.*)\sbytes', err_msg).group(1))
+        needs = int(re.search(r'needs\s(.*)\sbytes\shas', err_msg).group(1))
+        has = int(re.search(r'bytes\shas\s(.*)\sbytes', err_msg).group(1))
         raise LowRamError(needs, needs - has)
     elif "transaction executed locally, but may not be" in err_msg:
         pass
@@ -44,7 +43,7 @@ def validate(omittable):
         raise Error(err_msg)
 
 
-def excepthook(type, value, traceback):
+def excepthook(exc_type, value, traceback):
     print(value)
 
 
@@ -62,7 +61,7 @@ def __init__(
         else:
             sys.excepthook = excepthook
             sys.tracebacklimit = 0
-            from inspect import currentframe, getframeinfo, stack
+            from inspect import getframeinfo, stack
             frameinfo = getframeinfo(stack()[stack_frame][0])
             details = " {} {}".format(frameinfo.filename, frameinfo.lineno) 
             self.message = logger.error(message, translate, details=details)