http-sf 1.2.0__tar.gz → 1.2.1__tar.gz

{http_sf-1.2.0 → http_sf-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: http-sf
-Version: 1.2.0
+Version: 1.2.1
 Summary: Parse and serialise HTTP Structured Fields
 Author-email: Mark Nottingham <mnot@mnot.net>
 License-Expression: MIT
@@ -13,6 +13,7 @@ Requires-Dist: typing_extensions
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: black; extra == "dev"
+Requires-Dist: isort; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-md; extra == "dev"

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/__init__.py

@@ -25,28 +25,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
-from typing import Tuple, List, Dict, Optional, Callable
+from typing import Callable, Dict, List, Optional, Tuple
 
 from http_sf.dictionary import parse_dictionary, ser_dictionary
+from http_sf.errors import StructuredFieldError
 from http_sf.item import parse_item, ser_item
 from http_sf.list import parse_list, ser_list
 from http_sf.retrofit import retrofit
+from http_sf.state import ParserState
 from http_sf.types import (
-    StructuredType,
-    Token,
-    DisplayString,
-    OnDuplicateKeyType,
     DictionaryType,
-    ListType,
-    ItemType,
+    DisplayString,
     InnerListType,
+    ItemType,
+    ListType,
+    OnDuplicateKeyType,
+    StructuredType,
+    Token,
 )
-from http_sf.util import discard_ows, to_json, from_json
-from http_sf.state import ParserState
-from http_sf.errors import StructuredFieldError
-
+from http_sf.util import discard_ows, from_json, to_json
 
 __all__ = [
     "parse",

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/__main__.py

@@ -5,7 +5,6 @@ import sys
 
 from . import parse, to_json
 
-
 parser = argparse.ArgumentParser(
     description="Validate and show data model of a Structured Field Value."
 )

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/bare_item.py

@@ -1,16 +1,16 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Dict, Callable, Any, Type
+from typing import Any, Callable, Dict, Type
 
 from http_sf.boolean import parse_boolean, ser_boolean
-from http_sf.byteseq import parse_byteseq, ser_byteseq, BYTE_DELIMIT
+from http_sf.byteseq import BYTE_DELIMIT, parse_byteseq, ser_byteseq
 from http_sf.date import parse_date, ser_date
 from http_sf.decimal import ser_decimal
 from http_sf.display_string import parse_display_string, ser_display_string
-from http_sf.integer import parse_number, ser_integer, NUMBER_START_CHARS
-from http_sf.string import parse_string, ser_string, DQUOTE
-from http_sf.token import parse_token, ser_token, TOKEN_START_CHARS
-from http_sf.types import BareItemType, Token, DisplayString
+from http_sf.integer import NUMBER_START_CHARS, parse_number, ser_integer
+from http_sf.string import DQUOTE, parse_string, ser_string
+from http_sf.token import TOKEN_START_CHARS, parse_token, ser_token
+from http_sf.types import BareItemType, DisplayString, Token
 
 from .errors import StructuredFieldError
 from .state import ParserState

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/byteseq.py

@@ -1,8 +1,9 @@
 import base64
 import binascii
 from string import ascii_letters, digits
-from .state import ParserState
+
 from .errors import StructuredFieldError
+from .state import ParserState
 
 BYTE_DELIMIT = ord(b":")
 B64CONTENT = set((ascii_letters + digits + "+/=").encode("ascii"))

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/date.py

@@ -1,7 +1,8 @@
-from datetime import datetime
-from .state import ParserState
+from datetime import datetime, timezone
+
 from .errors import StructuredFieldError
 from .integer import parse_integer
+from .state import ParserState
 
 
 def parse_date(state: ParserState) -> datetime:
@@ -11,7 +12,12 @@ def parse_date(state: ParserState) -> datetime:
         raise StructuredFieldError(
             "Non-integer Date", position=state.cursor, offending_char=None
         )
-    return datetime.fromtimestamp(value)
+    try:
+        return datetime.fromtimestamp(value, tz=timezone.utc)
+    except (ValueError, OSError) as why:
+        raise StructuredFieldError(
+            "Date value out of range", position=state.cursor, offending_char=None
+        ) from why
 
 
 def ser_date(inval: datetime) -> str:

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/dictionary.py

@@ -1,12 +1,11 @@
-from typing import cast, Optional
+from typing import Optional, cast
 
 from .errors import StructuredFieldError
 from .innerlist import parse_item_or_inner_list, ser_item_or_inner_list
 from .parameters import parse_params, ser_params
 from .state import ParserState
 from .types import DictionaryType, ItemType, OnDuplicateKeyType
-from .util import discard_http_ows, ser_key, parse_key
-
+from .util import discard_http_ows, parse_key, ser_key
 
 EQUALS = ord(b"=")
 COMMA = ord(b",")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/innerlist.py

@@ -1,4 +1,4 @@
-from typing import List, cast, Union, Optional
+from typing import List, Optional, Union, cast
 
 from .errors import StructuredFieldError
 from .item import parse_item, ser_item
@@ -6,14 +6,13 @@ from .parameters import parse_params, ser_params
 from .state import ParserState
 from .types import (
     InnerListType,
-    ItemType,
-    ParamsType,
     ItemOrInnerListType,
+    ItemType,
     OnDuplicateKeyType,
+    ParamsType,
 )
 from .util import discard_ows
 
-
 PAREN_OPEN = ord(b"(")
 PAREN_CLOSE = ord(b")")
 INNERLIST_DELIMS = set(b" )")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/integer.py

@@ -61,7 +61,9 @@ def parse_number(state: ParserState) -> Union[int, Decimal]:
         elif _type is INTEGER and char == PERIOD:
             # spec says 12, but character is appended afterwards
             if num_length > 13:
-                raise ValueError("Decimal too long.")
+                raise StructuredFieldError(
+                    "Decimal too long.", position=state.cursor, offending_char=None
+                )
         state.cursor += 1
         num_length = state.cursor - num_start - 1
         if char in DIGITS:

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/item.py

@@ -1,9 +1,9 @@
-from typing import Tuple, Optional
+from typing import Optional, Tuple
 
 from .bare_item import parse_bare_item, ser_bare_item
 from .parameters import parse_params, ser_params
 from .state import ParserState
-from .types import BareItemType, ItemType, ParamsType, OnDuplicateKeyType
+from .types import BareItemType, ItemType, OnDuplicateKeyType, ParamsType
 
 PAREN_OPEN = ord(b"(")
 SEMICOLON = ord(b";")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/list.py

@@ -6,7 +6,6 @@ from .state import ParserState
 from .types import ListType, OnDuplicateKeyType
 from .util import discard_http_ows
 
-
 COMMA = ord(b",")
 
 

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/parameters.py

@@ -3,7 +3,7 @@ from typing import Optional
 from .bare_item import parse_bare_item, ser_bare_item
 from .errors import StructuredFieldError
 from .state import ParserState
-from .types import BareItemType, ParamsType, OnDuplicateKeyType
+from .types import BareItemType, OnDuplicateKeyType, ParamsType
 from .util import discard_ows, parse_key, ser_key
 
 PAREN_OPEN = ord(b"(")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/token.py

@@ -1,6 +1,7 @@
 from string import ascii_letters, digits
-from http_sf.types import Token
+
 from http_sf.state import ParserState
+from http_sf.types import Token
 
 TOKEN_START_CHARS = set((ascii_letters + "*").encode("ascii"))
 TOKEN_CHARS = set((ascii_letters + digits + ":/!#$%&'*+-.^_`|~").encode("ascii"))

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/types.py

@@ -1,7 +1,8 @@
 from collections import UserString
 from datetime import datetime
 from decimal import Decimal
-from typing import Union, Dict, List, Tuple, Callable, Any
+from typing import Any, Callable, Dict, List, Tuple, Union
+
 from typing_extensions import TypeAlias
 
 

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/util.py

@@ -1,14 +1,14 @@
 import base64
-from datetime import datetime
-from decimal import Decimal
 import json
 import re
+from datetime import datetime, timezone
+from decimal import Decimal
 from string import ascii_lowercase, ascii_uppercase, digits
 from typing import Any
 
-from .types import StructuredType, Token, DisplayString, JsonDict
-from .state import ParserState
 from .errors import StructuredFieldError
+from .state import ParserState
+from .types import DisplayString, JsonDict, StructuredType, Token
 
 SPACE = ord(b" ")
 HTTP_OWS = set(b" \t")
@@ -115,7 +115,10 @@ def json_load(inobj: JsonDict) -> Any:
     if objtype == "binary":
         return base64.b32decode(inobj["value"])
     if objtype == "date":
-        return datetime.fromtimestamp(inobj["value"])
+        try:
+            return datetime.fromtimestamp(inobj["value"], tz=timezone.utc)
+        except (ValueError, OSError):
+            return int(inobj["value"])
     if objtype == "displaystring":
         return DisplayString(inobj["value"])
     raise ValueError(f"Unknown object type - {inobj}")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: http-sf
-Version: 1.2.0
+Version: 1.2.1
 Summary: Parse and serialise HTTP Structured Fields
 Author-email: Mark Nottingham <mnot@mnot.net>
 License-Expression: MIT
@@ -13,6 +13,7 @@ Requires-Dist: typing_extensions
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: black; extra == "dev"
+Requires-Dist: isort; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-md; extra == "dev"

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf.egg-info/SOURCES.txt

@@ -30,5 +30,6 @@ http_sf.egg-info/requires.txt
 http_sf.egg-info/top_level.txt
 test/test.py
 test/test_callback.py
+test/test_error_contract.py
 test/test_perf.py
 test/test_position.py

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf.egg-info/requires.txt

@@ -3,6 +3,7 @@ typing_extensions
 [dev]
 mypy
 black
+isort
 pylint
 pytest
 pytest-md

{http_sf-1.2.0 → http_sf-1.2.1}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["mypy", "black", "pylint", "pytest", "pytest-md", "validate-pyproject", "build"]
+dev = ["mypy", "black", "isort", "pylint", "pytest", "pytest-md", "validate-pyproject", "build"]
 
 [project.urls]
 homepage = "https://github.com/mnot/http-sf"
@@ -40,6 +40,7 @@ version = {attr = "http_sf.__version__"}
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["http_sf", "http_sf.*"]
+exclude = ["build*", "dist*"]
 namespaces = false
 
 [tool.setuptools]
@@ -80,3 +81,6 @@ min-public-methods=1
 
 [tool.pylint.similarities]
 min-similarity-lines = 10
+
+[tool.isort]
+profile = "black"

{http_sf-1.2.0 → http_sf-1.2.1}/test/test.py

@@ -54,7 +54,11 @@ def run_suite(suite_name: str, suite: List) -> None:
             if ser_success:
                 suite_passed += 1
             else:
-                print(f"{FAIL} * {test['name']}: SERIALISE FAIL{ENDC}")
+                if test.get("can_fail", False):
+                    print(f"{WARN} * {test['name']}: SERIALISE FAIL (non-critical){ENDC}")
+                    suite_passed += 1
+                else:
+                    print(f"{FAIL} * {test['name']}: SERIALISE FAIL{ENDC}")
                 print(f"    - expected: {ser_expected}")
                 print(f"    -      got: ['{serialised}']")
                 if ser_fail_reason:

http_sf-1.2.1/test/test_error_contract.py

@@ -0,0 +1,69 @@
+"""
+Tests that all parse errors raise StructuredFieldError, never bare ValueError
+or OSError, regardless of input. Covers cases where the SF integer range
+permits values that downstream Python APIs reject.
+"""
+import sys
+from http_sf import parse, StructuredFieldError
+
+
+def test_date_out_of_range():
+    print("Testing out-of-range Date values raise StructuredFieldError...")
+
+    # Max SF integer — year ~31 million, far outside datetime's year 1-9999 range
+    try:
+        parse(b"@999999999999999", tltype="item")
+        print("  Test 1: FAIL (no exception raised)")
+        sys.exit(1)
+    except StructuredFieldError:
+        print("  Test 1: OK (large positive timestamp)")
+    except (ValueError, OSError) as e:
+        print(f"  Test 1: FAIL (wrong exception type {type(e).__name__}: {e})")
+        sys.exit(1)
+
+    # Min SF integer — far before year 1
+    try:
+        parse(b"@-999999999999999", tltype="item")
+        print("  Test 2: FAIL (no exception raised)")
+        sys.exit(1)
+    except StructuredFieldError:
+        print("  Test 2: OK (large negative timestamp)")
+    except (ValueError, OSError) as e:
+        print(f"  Test 2: FAIL (wrong exception type {type(e).__name__}: {e})")
+        sys.exit(1)
+
+    print("All Date out-of-range tests passed.")
+
+
+def test_decimal_too_long():
+    print("Testing overlong decimal integer part raises StructuredFieldError...")
+
+    # 14 digits before decimal point — exceeds the 12-digit SF limit
+    try:
+        parse(b"12345678901234.1", tltype="item")
+        print("  Test 1: FAIL (no exception raised)")
+        sys.exit(1)
+    except StructuredFieldError:
+        print("  Test 1: OK (14-digit integer part)")
+    except ValueError as e:
+        print(f"  Test 1: FAIL (wrong exception type ValueError: {e})")
+        sys.exit(1)
+
+    # Exactly at the boundary — 13 digits before decimal (also invalid per spec)
+    try:
+        parse(b"1234567890123.1", tltype="item")
+        print("  Test 2: FAIL (no exception raised)")
+        sys.exit(1)
+    except StructuredFieldError:
+        print("  Test 2: OK (13-digit integer part)")
+    except ValueError as e:
+        print(f"  Test 2: FAIL (wrong exception type ValueError: {e})")
+        sys.exit(1)
+
+    print("All Decimal too-long tests passed.")
+
+
+if __name__ == "__main__":
+    test_date_out_of_range()
+    print()
+    test_decimal_too_long()

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/boolean.py

@@ -1,5 +1,5 @@
-from .state import ParserState
 from .errors import StructuredFieldError
+from .state import ParserState
 
 QUESTION = ord(b"?")
 ONE = ord(b"1")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/display_string.py

@@ -1,5 +1,5 @@
-from .state import ParserState
 from .errors import StructuredFieldError
+from .state import ParserState
 from .types import DisplayString
 
 PERCENT = ord("%")

{http_sf-1.2.0 → http_sf-1.2.1}/http_sf/string.py

@@ -1,5 +1,5 @@
-from .state import ParserState
 from .errors import StructuredFieldError
+from .state import ParserState
 
 DQUOTE = ord('"')
 BACKSLASH = ord("\\")