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

{bare-script-3.0.10/src/bare_script.egg-info → bare_script-3.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bare-script
-Version: 3.0.10
+Version: 3.0.12
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs

{bare-script-3.0.10 → bare_script-3.0.12}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 3.0.10
+version = 3.0.12
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare-script-3.0.10 → bare_script-3.0.12}/src/bare_script/library.py

@@ -330,7 +330,7 @@ _ARRAY_SORT_ARGS = value_args_model([
 # $group: Data
 # $doc: Aggregate a data array
 # $arg data: The data array
-# $arg aggregation: The [aggregation model](model.html#var.vName='Aggregation')
+# $arg aggregation: The [aggregation model](https://craigahobbs.github.io/bare-script-py/library/model.html#var.vName='Aggregation')
 # $return: The aggregated data array
 def _data_aggregate(args, unused_options):
     data, aggregation = value_args_validate(_DATA_AGGREGATE_ARGS, args)
@@ -1232,7 +1232,8 @@ _REGEX_ESCAPE_ARGS = value_args_model([
 # $doc: Find the first match of a regular expression in a string
 # $arg regex: The regular expression
 # $arg string: The string
-# $return: The [match object](model.html#var.vName='RegexMatch'), or null if no matches are found
+# $return: The [match object](https://craigahobbs.github.io/bare-script-py/library/model.html#var.vName='RegexMatch'),
+# $return: or null if no matches are found
 def _regex_match(args, unused_options):
     regex, string = value_args_validate(_REGEX_MATCH_ARGS, args)
     match = regex.search(string)
@@ -1249,7 +1250,7 @@ _REGEX_MATCH_ARGS = value_args_model([
 # $doc: Find all matches of regular expression in a string
 # $arg regex: The regular expression
 # $arg string: The string
-# $return: The array of [match objects](model.html#var.vName='RegexMatch')
+# $return: The array of [match objects](https://craigahobbs.github.io/bare-script-py/library/model.html#var.vName='RegexMatch')
 def _regex_match_all(args, unused_options):
     regex, string = value_args_validate(_REGEX_MATCH_ALL_ARGS, args)
     return [_regex_match_groups(match) for match in regex.finditer(string)]
@@ -1755,8 +1756,10 @@ _SYSTEM_COMPARE_ARGS = value_args_model([
 # $function: systemFetch
 # $group: System
 # $doc: Retrieve a URL resource
-# $arg url: The resource URL, [request model](model.html#var.vName='SystemFetchRequest'), or array of URL and
-# $arg url: [request model](model.html#var.vName='SystemFetchRequest')
+# $arg url: The resource URL,
+# $arg url: [request model](https://craigahobbs.github.io/bare-script-py/library/model.html#var.vName='SystemFetchRequest'),
+# $arg url: or array of URL and
+# $arg url: [request model](https://craigahobbs.github.io/bare-script-py/library/model.html#var.vName='SystemFetchRequest')
 # $return: The response string or array of strings; null if an error occurred
 def _system_fetch(args, options):
     url, = value_args_validate(_SYSTEM_FETCH_ARGS, args)
@@ -1962,7 +1965,7 @@ _SYSTEM_TYPE_ARGS = value_args_model([
 # $return: The encoded URL string
 def _url_encode(args, unused_options):
     url, extra = value_args_validate(_URL_ENCODE_ARGS, args)
-    safe = "':/&(" if extra else "':/&()"
+    safe = "':/&+(" if extra else "':/&+()"
     return urllib.parse.quote(url, safe=safe)
 
 _URL_ENCODE_ARGS = value_args_model([

{bare-script-3.0.10 → bare_script-3.0.12/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bare-script
-Version: 3.0.10
+Version: 3.0.12
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs