various updates and fixes to talk examples

Author: tleonhardt

PyOhio_2019/examples/arg_decorators.py

@@ -16,6 +16,7 @@ def __init__(self):
     fsize_parser = cmd2.Cmd2ArgumentParser(description='Obtain the size of a file')
     fsize_parser.add_argument('-c', '--comma', action='store_true',
                               help='add comma for thousands separator')
+    fsize_parser.add_argument('-u', '--unit', choices=['MB', 'KB'], help='unit to display size in')
     fsize_parser.add_argument('file_path', help='path of file',
                               completer_method=cmd2.Cmd.path_complete)
 
@@ -30,9 +31,17 @@ def do_fsize(self, args: argparse.Namespace) -> None:
             self.perror("Error retrieving size: {}".format(ex))
             return
 
+        if args.unit == 'KB':
+            size /= 1024
+        elif args.unit == 'MB':
+            size /= 1024 * 1024
+        else:
+            args.unit = 'bytes'
+        size = round(size, 2)
+
         if args.comma:
             size = '{:,}'.format(size)
-        self.poutput('{} bytes'.format(size))
+        self.poutput('{} {}'.format(size, args.unit))
 
     # do_pow parser
     pow_parser = argparse.ArgumentParser()

PyOhio_2019/examples/pyscript_example.py

@@ -22,7 +22,7 @@ def __init__(self):
     def _set_prompt(self):
         """Set prompt so it displays the current working directory."""
         self._cwd = os.getcwd()
-        self.prompt = style('{!r} $ '.format(self.cwd), fg='cyan')
+        self.prompt = style('{!r} $ '.format(self._cwd), fg='cyan')
 
     def postcmd(self, stop: bool, line: str) -> bool:
         """Hook method executed just after a command dispatch is finished.
@@ -35,7 +35,6 @@ def postcmd(self, stop: bool, line: str) -> bool:
         self._set_prompt()
         return stop
 
-    @property
     def cwd(self):
         """Read-only property used by the pyscript to obtain cwd"""
         return self._cwd
@@ -94,7 +93,7 @@ def do_dir(self, args, unknown):
             return
 
         # Get the contents as a list
-        contents = os.listdir(self.cwd)
+        contents = os.listdir(self._cwd)
 
         fmt = '{} '
         if args.long:

PyOhio_2019/examples/scripts/conditional_flow.py

@@ -21,8 +21,8 @@
     directory = 'foobar'
     print('Using default directory: {!r}'.format(directory))
 
-# Keep track of where we started
-original_dir = cwd
+# Keep track of where we started - NOTE: cwd was added to self.py_locals dictionary so we can access it
+original_dir = cwd()
 
 # Try to change to the specified directory
 cd_result = app('cd {}'.format(directory))