Skip to content

Commit 8ceda14

Browse files
committed
moving away from nio buffer string pathways
1 parent f39c78c commit 8ceda14

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Diff for: deps.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:paths ["src"]
22
:deps {org.clojure/clojure {:mvn/version "1.11.1" :scope "provided"}
3-
cnuernber/dtype-next {:mvn/version "10.000"}
3+
cnuernber/dtype-next {:mvn/version "10.009-SNAPSHOT"}
44
net.java.dev.jna/jna {:mvn/version "5.12.1"}
55
org.clojure/data.json {:mvn/version "1.0.0"}
66
;;Replace me with caffeine...

Diff for: src/libpython_clj2/python/ffi.clj

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
[tech.v3.datatype.struct :as dt-struct]
1717
[tech.v3.datatype.errors :as errors]
1818
[tech.v3.datatype.native-buffer :as native-buffer]
19-
[tech.v3.datatype.nio-buffer :as nio-buffer]
2019
[tech.v3.datatype.protocols :as dt-proto]
2120
[tech.v3.resource :as resource]
2221
[libpython-clj2.python.gc :as pygc]
@@ -793,11 +792,7 @@ Each call must be matched with PyGILState_Release"}
793792
(size-obj 0)
794793
nil)]
795794
(native-buffer/free size-obj)
796-
(-> (.decode StandardCharsets/UTF_8
797-
;;avoid resource chaining for performance
798-
^java.nio.ByteBuffer (nio-buffer/native-buf->nio-buf
799-
nbuf {:resource-type nil}))
800-
(.toString))))
795+
(native-buffer/native-buffer->string nbuf)))
801796

802797
(defn pytype-name
803798
^String [type-pyobj]

0 commit comments

Comments
 (0)