Support python3.5

Author: ijl

Cargo.toml

@@ -26,6 +26,7 @@ classifier = [
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",

README.md

@@ -17,8 +17,8 @@ conformance on NaN/Infinity/-Infinity, having an option for strict
 JSON conformance on 53-bit integers, not supporting pretty
 printing, and not supporting all standard library options.
 
-It supports CPython 3.6 and 3.7 and distributes wheels for Linux, macOS, and
-Windows. The repository and issue tracker is
+It supports CPython 3.5, 3.6, 3.7, and 3.8. It distributes wheels for Linux,
+macOS, and Windows. The repository and issue tracker is
 [github.com/ijl/orjson](https://github.com/ijl/orjson).
 
 ## Usage

ci/azure-pipelines.yml

@@ -34,6 +34,23 @@ jobs:
       dependencies: apt
   - template: ./azure-posix.yml
 
+- job: linux_python35
+  pool:
+    vmImage: ubuntu-16.04
+  variables:
+    interpreter: python3.5
+    target: x86_64-unknown-linux-gnu
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.5'
+      addToPath: true
+  - checkout: self
+  - template: ./azure-linux.yml
+    parameters:
+      dependencies: apt
+  - template: ./azure-posix.yml
+
 - job: macos_python37
   pool:
     vmImage: xcode9-macos10.13
@@ -64,6 +81,21 @@ jobs:
   - template: ./azure-macos.yml
   - template: ./azure-posix.yml
 
+- job: macos_python35
+  pool:
+    vmImage: xcode9-macos10.13
+  variables:
+    interpreter: python3.5
+    target: x86_64-apple-darwin
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.5'
+      addToPath: true
+  - checkout: self
+  - template: ./azure-macos.yml
+  - template: ./azure-posix.yml
+
 - job: win_python37
   pool:
     vmImage: vs2017-win2016
@@ -93,3 +125,19 @@ jobs:
       architecture: 'x64'
   - checkout: self
   - template: ./azure-win.yml
+
+- job: win_python35
+  pool:
+    vmImage: vs2017-win2016
+  variables:
+    interpreter: C:\hostedtoolcache\windows\Python\3.5.4\x64\python.exe
+    target: x86_64-pc-windows-msvc
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.5'
+      addToPath: true
+      architecture: 'x64'
+  - checkout: self
+  - template: ./azure-win.yml
+

src/encode.rs

@@ -199,6 +199,12 @@ impl<'p> Serialize for SerializePyObject {
                                 std::ptr::null_mut() as *mut pyo3::ffi::PyObject,
                             )
                         };
+                        // test_datetime_partial_second_pendulum_not_supported
+                        if offset.is_null() {
+                            return Err(ser::Error::custom(
+                                    "datetime does not support timezones with offsets that are not even minutes",
+                                ));
+                        }
                         offset_second =
                             unsafe { pyo3::ffi::PyDateTime_DELTA_GET_SECONDS(offset) as i32 };
                         offset_day = unsafe { pyo3::ffi::PyDateTime_DELTA_GET_DAYS(offset) };

test/test_api.py

@@ -92,7 +92,6 @@ def test_option_range_high(self):
         with self.assertRaises(orjson.JSONEncodeError):
             orjson.dumps(True, option=4)
 
-
     def test_opts_multiple(self):
         """
         dumps() multiple option

test/test_datetime.py

@@ -2,10 +2,12 @@
 
 import unittest
 import datetime
+import sys
 
 import arrow
 import orjson
 import pendulum
+import pytest
 import pytz
 from dateutil import tz
 
@@ -154,7 +156,8 @@ def test_datetime_pendulum_partial_hour(self):
             b'["2018-12-01T02:03:04+10:30"]',
         )
 
-    def test_datetime_partial_second(self):
+    @pytest.mark.skipif(sys.version_info.minor == 5, reason="Non-even minute offsets supported on not 3.5")
+    def test_datetime_partial_second_pendulum_supported(self):
         """
         datetime.datetime UTC offset round seconds
 
@@ -165,6 +168,38 @@ def test_datetime_partial_second(self):
             b'["1937-01-01T12:00:27.87+00:20"]',
         )
 
+    @pytest.mark.skipif(sys.version_info.minor != 5, reason="Non-even minute offsets not supported on 3.5")
+    def test_datetime_partial_second_pendulum_not_supported(self):
+        """
+        datetime.datetime UTC offset round seconds
+
+        https://tools.ietf.org/html/rfc3339#section-5.8
+        """
+        with self.assertRaises(orjson.JSONEncodeError):
+            orjson.dumps([datetime.datetime(1937, 1, 1, 12, 0, 27, 87, tzinfo=pendulum.timezone('Europe/Amsterdam'))])
+
+    def test_datetime_partial_second_pytz(self):
+        """
+        datetime.datetime UTC offset round seconds
+
+        https://tools.ietf.org/html/rfc3339#section-5.8
+        """
+        self.assertEqual(
+            orjson.dumps([datetime.datetime(1937, 1, 1, 12, 0, 27, 87, tzinfo=pytz.timezone('Europe/Amsterdam'))]),
+            b'["1937-01-01T12:00:27.87+00:20"]',
+        )
+
+    def test_datetime_partial_second_dateutil(self):
+        """
+        datetime.datetime UTC offset round seconds
+
+        https://tools.ietf.org/html/rfc3339#section-5.8
+        """
+        self.assertEqual(
+            orjson.dumps([datetime.datetime(1937, 1, 1, 12, 0, 27, 87, tzinfo=tz.gettz('Europe/Amsterdam'))]),
+            b'["1937-01-01T12:00:27.87+00:20"]',
+        )
+
 
 class DateTests(unittest.TestCase):
 

test/test_jsonchecker.py

@@ -2,14 +2,13 @@
 """
 Tests files from http://json.org/JSON_checker/
 """
-from __future__ import division, print_function, unicode_literals
 
 import unittest
 import os
 import sys
 
 import orjson
-
+import pytest
 
 _path = os.path.join(os.path.dirname(__file__), '..', 'data', 'jsonchecker')
 
@@ -237,6 +236,7 @@ def test_fail33(self):
         """
         self._run_fail_json('fail33.json')
 
+    @pytest.mark.skipif(sys.version_info < (3,6), reason="Indeterminate key order")
     def test_pass01(self):
         """
         pass01.json
@@ -255,6 +255,7 @@ def test_pass02(self):
             b'[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]'
         )
 
+    @pytest.mark.skipif(sys.version_info < (3,6), reason="Indeterminate key order")
     def test_pass03(self):
         """
         pass03.json

test/test_roundtrip.py

@@ -5,6 +5,7 @@
 import sys
 
 import orjson
+import pytest
 
 _path = os.path.join(os.path.dirname(__file__), '..', 'data', 'roundtrip')
 
@@ -75,6 +76,7 @@ def test_roundtrip009(self):
         """
         self._run_roundtrip_json('roundtrip09.json')
 
+    @pytest.mark.skipif(sys.version_info < (3,6), reason="Indeterminate key order")
     def test_roundtrip010(self):
         """
         roundtrip010.json

test/test_ujson.py

@@ -9,6 +9,7 @@
 import unittest
 
 import orjson
+import pytest
 
 
 class UltraJSONTests(unittest.TestCase):
@@ -346,12 +347,14 @@ def test_decodeNullCharacter(self):
         input = "\"31337 \\u0000 31337\""
         self.assertEqual(orjson.loads(input), json.loads(input))
 
+    @pytest.mark.skipif(sys.version_info < (3,6), reason="Bytes input not supported in older Python versions")
     def test_decodeEscape(self):
         base = '\u00e5'.encode('utf-8')
         quote = "\"".encode()
         input = quote + base + quote
         self.assertEqual(json.loads(input), orjson.loads(input))
 
+    @pytest.mark.skipif(sys.version_info < (3,6), reason="Bytes input not supported in older Python versions")
     def test_decodeBigEscape(self):
         for _ in range(10):
             base = '\u00e5'.encode('utf-8')