ormsgpack 1.5.0__tar.gz → 1.6.0__tar.gz

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.6.0 18/10/2024
+
+### Fixed
+
+- Deduplicate map keys also when `OPT_NON_STR_KEYS` is set [#279](/../../issues/279)
+- Add missing type information for Ext type by [trim21](https://github.com/trim21) in [#285](/../../pull/285)
+- Fix type annotation of unpackb first argument
+
+### Changed
+
+- Add support for python 3.13
+- Improve test coverage
+
 ## 1.5.0 19/04/2024
 
 - Add support for numpy datetime64 and float16 types
@@ -47,7 +60,7 @@
 
 ### Fixed
 
-- `once_cell` poisoning on parallel initialization by (@Quitlox)[https://github.com/Quitlox] in (#153)[https://github.com/aviramha/ormsgpack/pull/153]
+- `once_cell` poisoning on parallel initialization by [@Quitlox](https://github.com/Quitlox) in [#153](/../../pull/153)
 
 
 ## 1.2.5 02/02/2023
@@ -69,7 +82,7 @@
 
 ## 1.2.3 - 26/06/2022
 ### Misc
-- Updated dependencies. partially by [@tilman19](https://github.com/aviramha/ormsgpack/pull/101)
+- Updated dependencies. partially by [@tilman19](/../../pull/101)
 - Handle clippy warnings.
 
 
@@ -82,15 +95,15 @@
 - Update dependencies
 ## 1.2.0 - 14/2/2022
 ### Changed
-- Extended int passthrough to support u64. by [@pejter](https://github.com/aviramha/ormsgpack/pull/77)
+- Extended int passthrough to support u64. by [@pejter](/../../pull/77)
 ### Misc
-- Updated README to include new options. by [@ThomasTNO](https://github.com/aviramha/ormsgpack/pull/70)
+- Updated README to include new options. by [@ThomasTNO](/../../pull/70)
 - Updated dependencies
 - Renamed in `numpy.rs` `from_parent` to `to_children` to fix new lint rules
 ## 1.1.0 - 8/1/2022
 ### Added
-- Add optional passthrough for tuples. by [@TariqTNO](https://github.com/aviramha/ormsgpack/pull/64)
-- Add optional passthrough for ints, that do not fit into an i64. by [@TariqTNO](https://github.com/aviramha/ormsgpack/pull/64)
+- Add optional passthrough for tuples. by [@TariqTNO](/../../pull/64)
+- Add optional passthrough for ints, that do not fit into an i64. by [@TariqTNO](/../../pull/64)
 ### Changed
 - `opt` parameter can be `None`.
 ### Misc
@@ -132,7 +145,7 @@
 - Refactored adding objects to the module, creating a `__all__` object similar to the way PyO3 creates. This solves an issue with upgrading to new maturin version.
 - Changed < Py3.7 implementation to use automatic range inclusion.
 - Added test to validate correct Python method flags are used on declare.
-- Changed to use PyO3 configurations instead of our own. PR [#25](https://github.com/aviramha/ormsgpack/pull/25) by [@pejter](https://github.com/pejter).
+- Changed to use PyO3 configurations instead of our own. PR [#25](/../../pull/25) by [@pejter](https://github.com/pejter).
 ## 0.3.2 - 13/7/2021
 ### Fixed
 - Fix memory leak serializing `datetime.datetime` with `tzinfo`. (Copied from orjson)
@@ -142,9 +155,9 @@
 - Setup dependabot.
 ## 0.3.1 - 19/6/2021
 ### Changed
-- `packb` of maps and sequences is now almost 2x faster as it leverages known size. PR [#18](https://github.com/aviramha/ormsgpack/pull/18) by [@ijl](https://github.com/ijl).
+- `packb` of maps and sequences is now almost 2x faster as it leverages known size. PR [#18](/../../pull/18) by [@ijl](https://github.com/ijl).
 ### Misc
-- Added `scripts/bench_target.py` and `scripts/profile.sh` for easily benchmarking and profiling. Works only on Linux. PR [#17](https://github.com/aviramha/ormsgpack/pull/17) by [@ijl](https://github.com/ijl).
+- Added `scripts/bench_target.py` and `scripts/profile.sh` for easily benchmarking and profiling. Works only on Linux. PR [#17](/../../pull/17) by [@ijl](https://github.com/ijl).
 ## 0.3.0 - 13/6/2021
 ### Added
 - `unpackb` now accepts keyword argument `option` with argument `OPT_NON_STR_KEYS`. This option will let ormsgpack

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/Cargo.lock

@@ -31,15 +31,9 @@ checksum = "b993cd767a2bc7307dd87622311ca22c44329cc7a21366206bfa0896827b2bad"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bytecount"
@@ -102,47 +96,37 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "ormsgpack"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
  "ahash",
  "associative-cache",
@@ -161,34 +145,11 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
-
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "portable-atomic"
@@ -198,23 +159,23 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.74"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.21.2"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
 dependencies = [
  "cfg-if",
  "libc",
  "memoffset",
- "parking_lot",
+ "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
@@ -222,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.21.2"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -232,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.21.2"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -242,22 +203,13 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "rmp"
 version = "0.8.14"
@@ -271,44 +223,38 @@ dependencies = [
 
 [[package]]
 name = "rmp-serde"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188"
+checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
 dependencies = [
  "byteorder",
  "rmp",
  "serde",
 ]
 
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
 [[package]]
 name = "serde"
-version = "1.0.198"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.198"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -323,9 +269,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.46"
+version = "2.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e"
+checksum = "9f660c3bfcefb88c538776b6685a0c472e3128b51e74d48793dc2a488196e8eb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -334,9 +280,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.12"
+version = "0.12.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "unicode-ident"
@@ -350,77 +296,20 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ormsgpack"
-version = "1.5.0"
+version = "1.6.0"
 authors = [
     "Aviram Hassan <aviramyhassan@gmail.com>",
     "Emanuele Giaquinta <emanuele.giaquinta@gmail.com>",
@@ -45,15 +45,15 @@ encoding_rs = { version = "0.8", default-features = false }
 half = { version = "2.4.1", default-features = false }
 itoa = { version = "1", default-features = false }
 once_cell = { version = "1", default-features = false, features = ["race"] }
-pyo3 = { version = "^0.21.2", default-features = false, features = ["extension-module"] }
+pyo3 = { version = "^0.22.5", default-features = false, features = ["extension-module"] }
 rmp = { version = "^0.8.14", default-features = false, features = ["std"] }
 rmp-serde = { version = "1", default-features = false }
 serde = { version = "1", default-features = false }
-serde_bytes = { version = "0.11.14", default-features = false, features = ["std"] }
+serde_bytes = { version = "0.11.15", default-features = false, features = ["std"] }
 smallvec = { version = "^1.13", default-features = false, features = ["union", "write"] }
 
 [build-dependencies]
-pyo3-build-config = { version = "^0.21.0" }
+pyo3-build-config = { version = "^0.22.0" }
 
 [profile.release]
 codegen-units = 1

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ormsgpack
-Version: 1.5.0
+Version: 1.6.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -14,6 +14,7 @@ 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: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Rust
@@ -52,7 +53,8 @@ e.g., "1970-01-01T00:00:00+00:00"
 * serializes `pydantic.BaseModel` instances natively
 * serializes arbitrary types using a `default` hook
 
-ormsgpack supports CPython 3.8, 3.9, 3.10, 3.11 and 3.12. ormsgpack does not support PyPy. Releases follow semantic
+ormsgpack supports CPython 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13.
+ormsgpack does not support PyPy. Releases follow semantic
 versioning and serializing a new object type without an opt-in flag is
 considered a breaking change.
 

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/README.md

@@ -20,7 +20,8 @@ e.g., "1970-01-01T00:00:00+00:00"
 * serializes `pydantic.BaseModel` instances natively
 * serializes arbitrary types using a `default` hook
 
-ormsgpack supports CPython 3.8, 3.9, 3.10, 3.11 and 3.12. ormsgpack does not support PyPy. Releases follow semantic
+ormsgpack supports CPython 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13.
+ormsgpack does not support PyPy. Releases follow semantic
 versioning and serializing a new object type without an opt-in flag is
 considered a breaking change.
 

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/pyproject.toml

@@ -16,6 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python",
     "Programming Language :: Rust",
@@ -30,6 +31,14 @@ requires = ["maturin>=1.0,<2.0"]
 python-source = "python"
 strip = true
 
+[tool.mypy]
+exclude = "benchmarks"
+strict = true
+
+[[tool.mypy.overrides]]
+module = ["msgpack"]
+ignore_missing_imports = true
+
 [tool.ruff]
 line-length = 88
 target-version = "py38"

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/python/ormsgpack/__init__.pyi

@@ -8,7 +8,7 @@ def packb(
     option: Optional[int] = None,
 ) -> bytes: ...
 def unpackb(
-    __obj: Union[str, bytes, bytearray, memoryview],
+    obj: Union[bytes, bytearray, memoryview],
     ext_hook: Optional[Callable[[int, bytes], Any]] = ...,
     option: Optional[int] = ...,
 ) -> Any: ...
@@ -16,6 +16,9 @@ def unpackb(
 class MsgpackDecodeError(ValueError): ...
 class MsgpackEncodeError(TypeError): ...
 
+class Ext:
+    def __init__(self, tag: int, data: bytes) -> None: ...
+
 OPT_NAIVE_UTC: int
 OPT_OMIT_MICROSECONDS: int
 OPT_PASSTHROUGH_BIG_INT: int

{ormsgpack-1.5.0 → ormsgpack-1.6.0}/src/deserialize/deserializer.rs

@@ -56,6 +56,26 @@ pub fn deserialize(
     }
 }
 
+fn unicode_from_map_key(key: &str) -> *mut pyo3::ffi::PyObject {
+    if unlikely!(key.len() > 64) {
+        let pykey = unicode_from_str(key);
+        hash_str(pykey);
+        pykey
+    } else {
+        let hash = cache_hash(key.as_bytes());
+        let map = unsafe { KEY_MAP.get_mut().unwrap_or_else(|| unreachable!()) };
+        let entry = map.entry(&hash).or_insert_with(
+            || hash,
+            || {
+                let pykey = unicode_from_str(key);
+                hash_str(pykey);
+                CachedKey::new(pykey)
+            },
+        );
+        entry.get()
+    }
+}
+
 #[derive(Clone, Copy)]
 struct MsgpackExtValue {
     ext_hook: Option<NonNull<pyo3::ffi::PyObject>>,
@@ -236,31 +256,8 @@ impl<'de> Visitor<'de> for MsgpackValue {
         let dict_ptr = ffi!(_PyDict_NewPresized(size));
         while let Some(key) = map.next_key::<Cow<str>>()? {
             let value = map.next_value_seed(self)?;
-            let pykey: *mut pyo3::ffi::PyObject;
-            let pyhash: pyo3::ffi::Py_hash_t;
-            if unlikely!(key.len() > 64) {
-                pykey = unicode_from_str(&key);
-                pyhash = hash_str(pykey);
-            } else {
-                let hash = cache_hash(key.as_bytes());
-                {
-                    let map = unsafe {
-                        KEY_MAP
-                            .get_mut()
-                            .unwrap_or_else(|| unsafe { std::hint::unreachable_unchecked() })
-                    };
-                    let entry = map.entry(&hash).or_insert_with(
-                        || hash,
-                        || {
-                            let pyob = unicode_from_str(&key);
-                            hash_str(pyob);
-                            CachedKey::new(pyob)
-                        },
-                    );
-                    pykey = entry.get();
-                    pyhash = unsafe { (*pykey.cast::<pyo3::ffi::PyASCIIObject>()).hash }
-                }
-            }
+            let pykey = unicode_from_map_key(&key);
+            let pyhash = unsafe { (*pykey.cast::<pyo3::ffi::PyASCIIObject>()).hash };
             let _ = ffi!(_PyDict_SetItem_KnownHash(
                 dict_ptr,
                 pykey,
@@ -480,21 +477,21 @@ impl<'de> Visitor<'de> for MsgpackKey {
     where
         E: de::Error,
     {
-        Ok(nonnull!(unicode_from_str(value.as_str())))
+        Ok(nonnull!(unicode_from_map_key(value.as_str())))
     }
 
     fn visit_borrowed_str<E>(self, value: &str) -> Result<Self::Value, E>
     where
         E: de::Error,
     {
-        Ok(nonnull!(unicode_from_str(value)))
+        Ok(nonnull!(unicode_from_map_key(value)))
     }
 
     fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
     where
         E: de::Error,
     {
-        Ok(nonnull!(unicode_from_str(value)))
+        Ok(nonnull!(unicode_from_map_key(value)))
     }
 
     fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>