bare-script 3.0.12__tar.gz → 3.0.14__tar.gz

{bare_script-3.0.12/src/bare_script.egg-info → bare_script-3.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bare-script
-Version: 3.0.12
+Version: 3.0.14
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -11,11 +11,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Interpreters
 Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown

{bare_script-3.0.12 → bare_script-3.0.14}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 3.0.12
+version = 3.0.14
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com
@@ -14,11 +14,11 @@ classifiers =
 	Intended Audience :: Developers
 	License :: OSI Approved :: MIT License
 	Operating System :: OS Independent
-	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
 	Topic :: Software Development :: Interpreters
 	Topic :: Utilities
 

{bare_script-3.0.12 → bare_script-3.0.14}/src/bare_script/library.py

@@ -1961,16 +1961,13 @@ _SYSTEM_TYPE_ARGS = value_args_model([
 # $group: URL
 # $doc: Encode a URL
 # $arg url: The URL string
-# $arg extra: Optional (default is true). If true, encode extra characters for wider compatibility.
 # $return: The encoded URL string
 def _url_encode(args, unused_options):
-    url, extra = value_args_validate(_URL_ENCODE_ARGS, args)
-    safe = "':/&+(" if extra else "':/&+()"
-    return urllib.parse.quote(url, safe=safe)
+    url, = value_args_validate(_URL_ENCODE_ARGS, args)
+    return urllib.parse.quote(url, safe="':/&+")
 
 _URL_ENCODE_ARGS = value_args_model([
-    {'name': 'url', 'type': 'string'},
-    {'name': 'extra', 'type': 'boolean', 'default': True}
+    {'name': 'url', 'type': 'string'}
 ])
 
 
@@ -1978,16 +1975,13 @@ _URL_ENCODE_ARGS = value_args_model([
 # $group: URL
 # $doc: Encode a URL component
 # $arg url: The URL component string
-# $arg extra: Optional (default is true). If true, encode extra characters for wider compatibility.
 # $return: The encoded URL component string
 def _url_encode_component(args, unused_options):
-    url, extra = value_args_validate(_URL_ENCODE_COMPONENT_ARGS, args)
-    safe = "'(" if extra else "'()"
-    return urllib.parse.quote(url, safe=safe)
+    url, = value_args_validate(_URL_ENCODE_COMPONENT_ARGS, args)
+    return urllib.parse.quote(url, safe="'")
 
 _URL_ENCODE_COMPONENT_ARGS = value_args_model([
-    {'name': 'url', 'type': 'string'},
-    {'name': 'extra', 'type': 'boolean', 'default': True}
+    {'name': 'url', 'type': 'string'}
 ])
 
 

{bare_script-3.0.12 → bare_script-3.0.14}/src/bare_script/value.py

@@ -308,7 +308,7 @@ def value_args_validate(fn_args, args, error_return_value=None):
 
     # Extra arguments?
     if len(args) > len(fn_args):
-        del args[len(fn_args):]
+        raise ValueArgsError(None, len(args), error_return_value)
 
     return args
 
@@ -321,14 +321,18 @@ class ValueArgsError(Exception):
 
        The function's error return value
 
-    :param arg_name: The function argument name
+    :param arg_name: The function argument name. If `arg_name` is None, there are too many arguments,
+        and `arg_value` is the number of arguments.
     :type arg_name: str
     :param arg_value: The function argument value
     :param return_value: The function's error return value
     """
 
     def __init__(self, arg_name, arg_value, return_value = None):
-        message = f'Invalid "{arg_name}" argument value, {value_json(arg_value)}'
+        if arg_name is None:
+            message = f'Too many arguments ({value_json(arg_value)})'
+        else:
+            message = f'Invalid "{arg_name}" argument value, {value_json(arg_value)}'
         super().__init__(message)
         self.return_value = return_value
 

{bare_script-3.0.12 → bare_script-3.0.14/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bare-script
-Version: 3.0.12
+Version: 3.0.14
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -11,11 +11,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Interpreters
 Classifier: Topic :: Utilities
 Description-Content-Type: text/markdown