bare-script 3.3.2__tar.gz → 3.4.0__tar.gz

{bare_script-3.3.2/src/bare_script.egg-info → bare_script-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 3.3.2
+Version: 3.4.0
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -21,6 +21,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: schema-markdown>=1.2.0
+Requires-Dist: urllib3>=2.5.0
 Dynamic: license-file
 
 # bare-script

{bare_script-3.3.2 → bare_script-3.4.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 3.3.2
+version = 3.4.0
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com
@@ -28,6 +28,7 @@ package_dir =
 	= src
 install_requires = 
 	schema-markdown >= 1.2.0
+	urllib3 >= 2.5.0
 
 [options.entry_points]
 console_scripts = 
@@ -37,7 +38,6 @@ console_scripts =
 [options.package_data]
 bare_script = 
 	include/*.bare
-	include/*.mds
 	include/*.txt
 
 [egg_info]

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script/bare.py

@@ -60,7 +60,7 @@ def main(argv=None):
                 script_source = None
                 try:
                     script_source = fetch_read_write({'url': script_value})
-                except: # pylint: disable=bare-except
+                except:
                     pass
                 if script_source is None:
                     raise ValueError(f'Failed to load "{script_value}"')
@@ -113,10 +113,10 @@ def main(argv=None):
             if status_code != 0:
                 break
 
-    except Exception as e: # pylint: disable=broad-exception-caught
+    except Exception as exc:
         if error_name is not None:
             print(f'{error_name}:')
-        print(str(e).strip())
+        print(str(exc).strip())
         status_code = 1
 
     # Return the status code

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script/baredoc.py

@@ -32,7 +32,7 @@ def main(argv=None):
         try:
             with open(file_, 'r', encoding='utf-8') as fh:
                 source = fh.read()
-        except: # pylint: disable=bare-except
+        except:
             pass
         if source is None:
             errors.append(f'Failed to load "{file_}"')
@@ -163,7 +163,7 @@ def main(argv=None):
             with open(args.output, 'w', encoding='utf-8') as fh:
                 fh.write(library_json)
             success = True
-        except: # pylint: disable=bare-except
+        except:
             pass
         if not success:
             print(f'error: Failed to write "{args.output}"')

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script/library.py

@@ -1314,9 +1314,8 @@ struct RegexMatch
 # $function: regexNew
 # $group: Regex
 # $doc: Create a regular expression
-# pylint: disable=line-too-long
+# pylint: disable-next=line-too-long
 # $arg pattern: The [regular expression pattern string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#writing_a_regular_expression_pattern)
-# pylint: enable=line-too-long
 # $arg flags: The regular expression flags. The string may contain the following characters:
 # $arg flags: - **i** - case-insensitive search
 # $arg flags: - **m** - multi-line search - "^" and "$" matches next to newline characters
@@ -1820,7 +1819,7 @@ def _system_fetch(args, options):
         if fetch_fn is not None:
             try:
                 response = fetch_fn(request_fetch)
-            except: # pylint: disable=bare-except
+            except:
                 pass
         responses.append(response)
 

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script/options.py

@@ -8,7 +8,14 @@ BareScript runtime option function implementations
 import os
 from pathlib import Path
 import re
-import urllib.request
+
+import urllib3
+
+
+# The fetch connection pool
+FETCH_POOL_COUNT = int(os.getenv('BARESCRIPT_FETCH_POOL_COUNT', '10'))
+FETCH_POOL_SIZE = int(os.getenv('BARESCRIPT_FETCH_POOL_SIZE', '10'))
+FETCH_POOL_MANAGER = urllib3.PoolManager(num_pools=FETCH_POOL_COUNT, maxsize=FETCH_POOL_SIZE)
 
 
 def fetch_http(request):
@@ -16,14 +23,18 @@ def fetch_http(request):
     A :func:`fetch function <fetch_fn>` implementation that fetches resources using HTTP GET and POST
     """
 
+    url = request['url']
     body = request.get('body')
-    req = urllib.request.Request(
-        request['url'],
-        data=body.encode('utf-8') if body is not None else None,
-        headers=request.get('headers', {})
-    )
-    with urllib.request.urlopen(req) as response:
-        return response.read().decode('utf-8')
+    headers = request.get('headers') or {}
+    method = 'GET' if body is None else 'POST'
+    try:
+        response = FETCH_POOL_MANAGER.request(method, url, body=body, headers=headers, retries=0)
+        if response.status != 200:
+            raise urllib3.exceptions.HTTPError(f'Fetch "{method}" "{url}" failed ({response.status})')
+        response_text = response.data.decode('utf-8')
+    finally:
+        response.close()
+    return response_text
 
 
 def fetch_read_only(request):

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script/runtime.py

@@ -116,7 +116,7 @@ def _execute_script_helper(statements, options, locals_):
                 # Fetch the URL
                 try:
                     script_text = fetch_fn({'url': url}) if fetch_fn is not None else None
-                except: # pylint: disable=bare-except
+                except:
                     script_text = None
                 if script_text is None:
                     raise BareScriptRuntimeError(f'Include of "{url}" failed')
@@ -238,7 +238,7 @@ def evaluate_expression(expr, options=None, locals_=None, builtins=True):
                 return func_value(func_args, options)
             except BareScriptRuntimeError:
                 raise
-            except Exception as error: # pylint: disable=broad-exception-caught
+            except Exception as error:
                 # Log and return null
                 if options is not None and 'logFn' in options and options.get('debug'):
                     options['logFn'](f'BareScript: Function "{func_name}" failed with error: {error}')

{bare_script-3.3.2 → bare_script-3.4.0/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 3.3.2
+Version: 3.4.0
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -21,6 +21,7 @@ Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: schema-markdown>=1.2.0
+Requires-Dist: urllib3>=2.5.0
 Dynamic: license-file
 
 # bare-script

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script.egg-info/SOURCES.txt

@@ -21,14 +21,9 @@ src/bare_script.egg-info/requires.txt
 src/bare_script.egg-info/top_level.txt
 src/bare_script/include/__init__.py
 src/bare_script/include/args.bare
-src/bare_script/include/args.mds
 src/bare_script/include/diff.bare
 src/bare_script/include/forms.bare
-src/bare_script/include/forms.mds
 src/bare_script/include/markdownUp.bare
 src/bare_script/include/pager.bare
-src/bare_script/include/pager.mds
 src/bare_script/include/unittest.bare
-src/bare_script/include/unittest.mds
-src/bare_script/include/unittestMock.bare
-src/bare_script/include/unittestMock.mds
+src/bare_script/include/unittestMock.bare

{bare_script-3.3.2 → bare_script-3.4.0}/src/bare_script.egg-info/requires.txt

@@ -1 +1,2 @@
 schema-markdown>=1.2.0
+urllib3>=2.5.0

bare_script-3.3.2/src/bare_script/include/args.mds

@@ -1,12 +0,0 @@
-# Licensed under the MIT License
-# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
-
-
-# Include sentinel
-if systemGlobalGet('argsSentinel'):
-    return
-endif
-
-
-systemLog('MarkdownUp - args.mds: args.mds is now args.bare - please update before 2025-06-01')
-include 'args.bare'

bare_script-3.3.2/src/bare_script/include/forms.mds

@@ -1,12 +0,0 @@
-# Licensed under the MIT License
-# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
-
-
-# Include sentinel
-if systemGlobalGet('formsSentinel'):
-    return
-endif
-
-
-systemLog('MarkdownUp - forms.mds: forms.mds is now forms.bare - please update before 2025-06-01')
-include 'forms.bare'

bare_script-3.3.2/src/bare_script/include/pager.mds

@@ -1,12 +0,0 @@
-# Licensed under the MIT License
-# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
-
-
-# Include sentinel
-if systemGlobalGet('pagerSentinel'):
-    return
-endif
-
-
-systemLog('MarkdownUp - pager.mds: pager.mds is now pager.bare - please update before 2025-06-01')
-include 'pager.bare'

bare_script-3.3.2/src/bare_script/include/unittest.mds

@@ -1,12 +0,0 @@
-# Licensed under the MIT License
-# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
-
-
-# Include sentinel
-if systemGlobalGet('unittestSentinel'):
-    return
-endif
-
-
-systemLog('MarkdownUp - unittest.mds: unittest.mds is now unittest.bare - please update before 2025-06-01')
-include 'unittest.bare'

bare_script-3.3.2/src/bare_script/include/unittestMock.mds

@@ -1,12 +0,0 @@
-# Licensed under the MIT License
-# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
-
-
-# Include sentinel
-if systemGlobalGet('unittestMockSentinel'):
-    return
-endif
-
-
-systemLog('MarkdownUp - unittestMock.mds: unittestMock.mds is now unittestMock.bare - please update before 2025-06-01')
-include 'unittestMock.bare'