Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Goblin OGM
AIO Gremlin
Commits
aaf571f1
Commit
aaf571f1
authored
Jan 18, 2018
by
davebshow
Browse files
getting ready for 3.3.0 release
parent
94c776d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
8 deletions
+18
-8
aiogremlin/driver/protocol.py
aiogremlin/driver/protocol.py
+16
-6
requirements.txt
requirements.txt
+1
-1
setup.py
setup.py
+1
-1
No files found.
aiogremlin/driver/protocol.py
View file @
aaf571f1
...
...
@@ -50,9 +50,13 @@ class GremlinServerWSProtocol(protocol.AbstractBaseProtocol):
msg
=
message
[
'status'
][
'message'
]
if
request_id
in
results_dict
:
result_set
=
results_dict
[
request_id
]
aggregate_to
=
message
[
'result'
][
'meta'
].
get
(
'aggregateTo'
,
'list'
)
meta_aggregate_to
=
message
[
'result'
][
'meta'
][
'@value'
]
if
len
(
meta_aggregate_to
)
>
1
:
aggregate_to
=
meta_aggregate_to
[
1
]
else
:
aggregate_to
=
'list'
result_set
.
aggregate_to
=
aggregate_to
if
status_code
==
407
:
auth
=
b
''
.
join
([
b
'
\x00
'
,
self
.
_username
.
encode
(
'utf-8'
),
b
'
\x00
'
,
self
.
_password
.
encode
(
'utf-8'
)])
...
...
@@ -64,10 +68,16 @@ class GremlinServerWSProtocol(protocol.AbstractBaseProtocol):
result_set
.
queue_result
(
None
)
else
:
if
data
:
for
result
in
data
:
result
=
self
.
_message_serializer
.
deserialize_message
(
result
)
message
=
Message
(
status_code
,
result
,
msg
)
result_set
.
queue_result
(
message
)
if
self
.
_message_serializer
.
version
==
b
"application/vnd.gremlin-v2.0+json"
:
for
result
in
data
:
result
=
self
.
_message_serializer
.
deserialize_message
(
result
)
message
=
Message
(
status_code
,
result
,
msg
)
result_set
.
queue_result
(
message
)
else
:
results
=
self
.
_message_serializer
.
deserialize_message
(
data
[
'@value'
])
for
result
in
results
:
message
=
Message
(
status_code
,
result
,
msg
)
result_set
.
queue_result
(
message
)
else
:
data
=
self
.
_message_serializer
.
deserialize_message
(
data
)
message
=
Message
(
status_code
,
data
,
msg
)
...
...
requirements.txt
View file @
aaf571f1
gremlinpython
==3.
2.6
gremlinpython
==3.
3.0
setup.py
View file @
aaf571f1
...
...
@@ -4,7 +4,7 @@ from setuptools import setup
setup
(
name
=
'aiogremlin'
,
version
=
'3.
2.7
'
,
version
=
'3.
3.0
'
,
url
=
''
,
license
=
'Apache Software License'
,
author
=
'davebshow'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment