easycoder 250204.1__py2.py3-none-any.whl → 250207.1__py2.py3-none-any.whl

easycoder/README.md

@@ -1,6 +1,6 @@
 # EasyCode source code
 These are the Python files that comprise **_EasyCoder_**.
 
-**_EasyCoder_** has a small number of third-party dependencies. A minor one is `pytz`, which handles timezones. The biggest one by far is `kivy`, a comprehensive Python graphics library.
+**_EasyCoder_** has a small number of third-party dependencies. A minor one is `pytz`, which handles timezones. The biggest one by far is `PySimpleGUI`, a comprehensive Python graphics library.
 
-If an **_EasyCoder_** script filename ends with `.ecs` it's a command-line script. If it ends with `.ecg` it's a script for a graphical application and will cause `kivy` to be imported. Obviously this will only work on a GUI-based system, whereas command-line scripts will run anywhere there is Python.
+If an **_EasyCoder_** script filename ends with `.ecs` it's a command-line script. If it ends with `.ecg` it's a script for a graphical application and will cause `PySimpleGUI` to be imported. Obviously this will only work on a GUI-based system, whereas command-line scripts will run anywhere there is Python.

easycoder/__init__.py

@@ -9,4 +9,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250204.1"
+__version__ = "250207.1"

easycoder/ec_core.py

@@ -484,6 +484,7 @@ class Core(Handler):
         except:
             pass
         RuntimeError(self.program, f'There is no label "{label}"')
+        return None
 
     def r_gotoPC(self, command):
         return command['goto']
@@ -498,14 +499,12 @@ class Core(Handler):
 
     def r_gosub(self, command):
         label = command['gosub'] + ':'
-        try:
-            address = self.symbols[label]
-            if address != None:
-                self.stack.append(self.nextPC())
-                return address
-        except:
-            pass
-        RuntimeError(self.program, f'There is no label "{label}"')
+        address = self.symbols[label]
+        if address != None:
+            self.stack.append(self.nextPC())
+            return address
+        RuntimeError(self.program, f'There is no label "{label + ":"}"')
+        return None
 
     # if <condition> <action> [else <action>]
     def k_if(self, command):
@@ -707,9 +706,11 @@ class Core(Handler):
     def r_load(self, command):
         target = self.getVariable(command['target'])
         file = self.getRuntimeValue(command['file'])
-        f = open(file, 'r')
-        content = f.read()
-        f.close()
+        try:
+            with open(file, 'r') as f:
+                content = f.read()
+        except:
+            content=None
         value = {}
         value['type'] = 'text'
         value['content'] = content
@@ -1005,8 +1006,10 @@ class Core(Handler):
         lino = str(code['lino'] + 1)
         while len(lino) < 5: lino = f' {lino}'
         if value == None: value = '<empty>'
-        if 'log' in command: print(f'{datetime.now().time()}:{lino}-> {value}')
-        else: print(value)
+        if 'log' in command:
+            print(f'{datetime.now().time()}:{lino}-> {value}')
+        else:
+            print(value)
         return self.nextPC()
 
     # Push a value onto a stack
@@ -1216,9 +1219,8 @@ class Core(Handler):
     def r_save(self, command):
         content = self.getRuntimeValue(command['content'])
         file = self.getRuntimeValue(command['file'])
-        f = open(file, 'w')
-        f.write(content)
-        f.close()
+        with open(file, 'w') as f:
+            f.write(content)
         return self.nextPC()
 
     # Send a message to a module
@@ -1817,10 +1819,12 @@ class Core(Handler):
             return None
 
         if token == 'value':
-            value['type'] = 'valueOf'
             if self.nextIs('of'):
-                value['content'] = self.nextValue()
-                return value
+                v = self.nextValue()
+                if v !=None:
+                    value['type'] = 'valueOf'
+                    value['content'] = v
+                    return value
             return None
 
         if token == 'length':
@@ -1989,10 +1993,6 @@ class Core(Handler):
         value['type'] = 'text'
         if self.encoding == 'utf-8':
             value['content'] = content.decode('utf-8')
-        elif self.encoding == 'hex':
-            b = content.encode('utf-8')
-            mb = binascii.unhexlify(b)
-            value['content'] = mb.decode('utf-8')
         elif self.encoding == 'base64':
             base64_bytes = content.encode('ascii')
             message_bytes = base64.b64decode(base64_bytes)
@@ -2036,10 +2036,6 @@ class Core(Handler):
         value['type'] = 'text'
         if self.encoding == 'utf-8':
             value['content'] = content.encode('utf-8')
-        elif self.encoding == 'hex':
-            b = content.encode('utf-8')
-            mb = binascii.hexlify(b)
-            value['content'] = mb.decode('utf-8')
         elif self.encoding == 'base64':
             data_bytes = content.encode('ascii')
             base64_bytes = base64.b64encode(data_bytes)

easycoder/ec_graphics.py

@@ -1,4 +1,5 @@
-from .ec_classes import FatalError, RuntimeError, Handler
+from .ec_classes import FatalError, RuntimeError
+from .ec_handler import Handler
 from .ec_gutils import GUtils
 import PySimpleGUI as psg
 import json

{easycoder-250204.1.dist-info → easycoder-250207.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250204.1
+Version: 250207.1
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-250204.1.dist-info → easycoder-250207.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
-easycoder/README.md,sha256=PYqOc_SkIGiFbyCNs90y7JqoqWe4aO1xYIW-6bOnFKU,573
-easycoder/__init__.py,sha256=hLMGC60RrVT7YsX6vj0nXfkwrDe44zEhhtTXTeYy8xk,262
+easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
+easycoder/__init__.py,sha256=bIXuFkzlKBKV89CzP8RTzVcXmrJ4rKJ6VctsvqmD4ns,262
 easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
 easycoder/ec_compiler.py,sha256=dFJEA_uOhD-HeSiAdBzmmA6q3LHThUVoJpSETanmSHs,4800
 easycoder/ec_condition.py,sha256=WSbONo4zs2sX1icOVpscZDFSCAEFmTsquoc2RGcLx_k,763
-easycoder/ec_core.py,sha256=ORrMf2TlsAxETK-5Of-zrSCHX517nVHtThI7ew9ts0o,87416
-easycoder/ec_graphics.py,sha256=8GhnqIOITyZzIkdjouTnOQ9x0J6RpMz0sFseKkJATfE,12977
+easycoder/ec_core.py,sha256=9YCBTXemI9T_TVtHfC2aSeVVyT7cCHCrwCCI6blY7pk,87209
+easycoder/ec_graphics.py,sha256=I5C4YYzdaCjL7_Vc7cNalABV18PL8QOqDbJQnQB6lrY,13000
 easycoder/ec_gutils.py,sha256=Pfz3u5KQieXm-F7qsB9gy6IUGDi-oJaX9xdiM9ZeO6s,5885
 easycoder/ec_handler.py,sha256=IJvxcrJJSR53d6DS_8H5qPHKhp9y5-GV4WXAjhZxu_o,2250
 easycoder/ec_program.py,sha256=R8zMukA-pfRsOpcy9WqTw7fE_190dQfrMt2la23Yrs4,9904
 easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250204.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250204.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250204.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-easycoder-250204.1.dist-info/METADATA,sha256=arFjAPGsq4FgHUm5QoCqVDJyiIgNQFSNF_1zVPzERlU,6162
-easycoder-250204.1.dist-info/RECORD,,
+easycoder-250207.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250207.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250207.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+easycoder-250207.1.dist-info/METADATA,sha256=hfeKKSAp_NMYhjLAFnxpA18xVPe2qaP7AGqWek7JnUU,6162
+easycoder-250207.1.dist-info/RECORD,,