branch: elpa/request
commit 6ddb4fc4d8a0746ee2dfd8473af315ebe8f6215b
Merge: fe567ec022 f4b2084343
Author: dickmao <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #221 from dickmao/cslux-data-alist-not-converted
Cslux data alist not converted
---
.github/workflows/test.yml | 9 +--------
request.el | 5 ++---
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 16b5f7cf4a..048009d23d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest]
+ os: [ubuntu-20.04]
emacs_version: [25.3, 26.3, 27.2, 28.2]
python_version: [2.7, 3.6]
@@ -87,13 +87,6 @@ jobs:
cask link list
continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}
- - name: lint
- if: |
- startsWith(matrix.python_version, '3') &&
- startsWith(matrix.emacs_version, '27')
- run: make lint
- continue-on-error: ${{ matrix.emacs_version == 'snapshot' }}
-
- name: test-install
if: startsWith(matrix.python_version, '2')
run: make test-install
diff --git a/request.el b/request.el
index 5798e09ff2..c36b3fcbd2 100644
--- a/request.el
+++ b/request.el
@@ -499,9 +499,8 @@ and requests.request_ (Python).
"request-default-error-callback: %s %s"
url symbol-status))))
(setq settings (plist-put settings :error error)))
- (unless (or (stringp data)
- (null data)
- (assoc-string "Content-Type" headers t))
+ (when (and (consp data)
+ (not (assoc-string "Content-Type" headers t)))
(setq data (request--urlencode-alist data))
(setq settings (plist-put settings :data data)))
(when params
