shotgun-api3 3.8.5__tar.gz → 3.9.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {shotgun_api3-3.8.5/shotgun_api3.egg-info → shotgun_api3-3.9.1}/PKG-INFO +9 -50
- shotgun_api3-3.9.1/README.md +43 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/setup.py +4 -4
- shotgun_api3-3.9.1/shotgun_api3/__init__.py +59 -0
- {shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3 → shotgun_api3-3.9.1/shotgun_api3/lib/httplib2}/auth.py +1 -1
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/mockgun/mockgun.py +3 -3
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/mockgun/schema.py +2 -2
- shotgun_api3-3.9.1/shotgun_api3/py.typed +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/shotgun.py +491 -545
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1/shotgun_api3.egg-info}/PKG-INFO +9 -50
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3.egg-info/SOURCES.txt +1 -18
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/tests/test_api.py +56 -199
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/tests/test_api_long.py +1 -3
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/tests/test_client.py +26 -45
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/tests/test_mockgun.py +2 -2
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/tests/test_proxy.py +1 -1
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/tests/test_unit.py +69 -31
- shotgun_api3-3.8.5/README.md +0 -84
- shotgun_api3-3.8.5/shotgun_api3/__init__.py +0 -25
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/__init__.py +0 -39
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/auth.py +0 -69
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/__init__.py +0 -1993
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/auth.py +0 -63
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/cacerts.txt +0 -2225
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/certs.py +0 -42
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/error.py +0 -48
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/iri2uri.py +0 -123
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python2/socks.py +0 -518
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3/cacerts.txt +0 -2225
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3/certs.py +0 -42
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3/error.py +0 -48
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3/iri2uri.py +0 -124
- shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/socks.py +0 -518
- shotgun_api3-3.8.5/shotgun_api3/lib/mimetypes.py +0 -598
- shotgun_api3-3.8.5/shotgun_api3/lib/sgsix.py +0 -87
- shotgun_api3-3.8.5/shotgun_api3/lib/sgutils.py +0 -62
- shotgun_api3-3.8.5/shotgun_api3/lib/six.py +0 -964
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/LICENSE +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/setup.cfg +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/__init__.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/certifi/__init__.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/certifi/__main__.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/certifi/cacert.pem +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/certifi/core.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/certifi/py.typed +0 -0
- {shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3 → shotgun_api3-3.9.1/shotgun_api3/lib/httplib2}/__init__.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/httplib2/cacerts.txt +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/httplib2/certs.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/httplib2/error.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/httplib2/iri2uri.py +0 -0
- {shotgun_api3-3.8.5/shotgun_api3/lib/httplib2/python3 → shotgun_api3-3.9.1/shotgun_api3/lib/httplib2}/socks.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/mockgun/__init__.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/mockgun/errors.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/pyparsing.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3/lib/sgtimezone.py +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3.egg-info/dependency_links.txt +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3.egg-info/not-zip-safe +0 -0
- {shotgun_api3-3.8.5 → shotgun_api3-3.9.1}/shotgun_api3.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: shotgun_api3
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.9.1
|
|
4
4
|
Summary: Flow Production Tracking Python API
|
|
5
5
|
Home-page: https://github.com/shotgunsoftware/python-api
|
|
6
6
|
Author: Autodesk
|
|
@@ -61,12 +61,12 @@ License: Copyright (c) 2009-2011, Shotgun Software Inc
|
|
|
61
61
|
Classifier: Development Status :: 5 - Production/Stable
|
|
62
62
|
Classifier: Intended Audience :: Developers
|
|
63
63
|
Classifier: Programming Language :: Python
|
|
64
|
-
Classifier: Programming Language :: Python :: 3.7
|
|
65
64
|
Classifier: Programming Language :: Python :: 3.9
|
|
66
65
|
Classifier: Programming Language :: Python :: 3.10
|
|
67
66
|
Classifier: Programming Language :: Python :: 3.11
|
|
67
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
68
68
|
Classifier: Operating System :: OS Independent
|
|
69
|
-
Requires-Python: >=3.
|
|
69
|
+
Requires-Python: >=3.9.0
|
|
70
70
|
Description-Content-Type: text/markdown
|
|
71
71
|
License-File: LICENSE
|
|
72
72
|
Dynamic: author
|
|
@@ -79,15 +79,16 @@ Dynamic: license-file
|
|
|
79
79
|
Dynamic: requires-python
|
|
80
80
|
Dynamic: summary
|
|
81
81
|
|
|
82
|
-
[](http://www.vfxplatform.com/ "Supported VFX Platform")
|
|
83
|
+
[](https://www.python.org/ "Supported Python versions")
|
|
84
|
+
[](http://developer.shotgridsoftware.com/python-api)
|
|
85
|
+
|
|
85
86
|
[](https://dev.azure.com/shotgun-ecosystem/Python%20API/_build/latest?definitionId=108&branchName=master)
|
|
86
87
|
[](https://coveralls.io/github/shotgunsoftware/python-api?branch=master)
|
|
87
88
|
|
|
88
89
|
# Flow Production Tracking Python API
|
|
89
90
|
|
|
90
|
-
Autodesk provides a simple Python-based API for accessing Flow Production Tracking and integrating with other tools. This is the official API that is maintained by Autodesk (https://
|
|
91
|
+
Autodesk provides a simple Python-based API for accessing Flow Production Tracking and integrating with other tools. This is the official API that is maintained by Autodesk (https://www.autodesk.com/support)
|
|
91
92
|
|
|
92
93
|
The latest version can always be found at http://github.com/shotgunsoftware/python-api
|
|
93
94
|
|
|
@@ -106,13 +107,6 @@ Some useful direct links:
|
|
|
106
107
|
|
|
107
108
|
You can see the [full history of the Python API on the documentation site](http://developer.shotgridsoftware.com/python-api/changelog.html).
|
|
108
109
|
|
|
109
|
-
## Updating HTTPLib2
|
|
110
|
-
|
|
111
|
-
The API comes with a copy of the `httplib2` inside the `shotgun_api3/lib` folder. To update the copy to a more recent version of the API, you can run the `update_httplib2.py` script at the root of this repository like this:
|
|
112
|
-
|
|
113
|
-
python update_httplib2.py vX.Y.Z
|
|
114
|
-
|
|
115
|
-
where `vX.Y.Z` is a release found on `httplib2`'s [release page](https://github.com/httplib2/httplib2/releases).
|
|
116
110
|
|
|
117
111
|
## Tests
|
|
118
112
|
|
|
@@ -124,42 +118,7 @@ Integration and unit tests are provided.
|
|
|
124
118
|
- (Note: Running `pip install -r tests/ci_requirements.txt` will install this package)
|
|
125
119
|
- A `tests/config` file (you can copy an example from `tests/example_config`).
|
|
126
120
|
- Tests can be run individually like this: `nosetests --config="nose.cfg" tests/test_client.py`
|
|
127
|
-
- Make sure to not forget the `--config="nose.cfg"` option. This option tells nose to use our config file.
|
|
121
|
+
- Make sure to not forget the `--config="nose.cfg"` option. This option tells nose to use our config file.
|
|
128
122
|
- `test_client` and `tests_unit` use mock server interaction and do not require a Flow Production Tracking instance to be available (no modifications to `tests/config` are necessary).
|
|
129
123
|
- `test_api` and `test_api_long` *do* require a Flow Production Tracking instance, with a script key available for the tests. The server and script user values must be supplied in the `tests/config` file. The tests will add test data to your server based on information in your config. This data will be manipulated by the tests, and should not be used for other purposes.
|
|
130
124
|
- To run all of the tests, use the shell script `run-tests`.
|
|
131
|
-
|
|
132
|
-
## Release process
|
|
133
|
-
|
|
134
|
-
### Packaging up new release
|
|
135
|
-
|
|
136
|
-
1) Update the Changelog in the `HISTORY.rst` file
|
|
137
|
-
- Add bullet points for any changes that have happened since the previous release. This may include changes you did not make so look at the commit history and make sure we don't miss anything. If you notice something was done that wasn't added to the changelog, hunt down that engineer and make them feel guilty for not doing so. This is a required step in making changes to the API.
|
|
138
|
-
- Try and match the language of previous change log messages. We want to keep a consistent voice.
|
|
139
|
-
- Make sure the date of the release matches today. We try and keep this TBD until we're ready to do a release so it's easy to catch that it needs to be updated.
|
|
140
|
-
- Make sure the version number is filled out and correct. We follow semantic versioning.
|
|
141
|
-
2) Ensure any changes or additions to public methods are documented
|
|
142
|
-
- Ensure that doc strings are updated in the code itself to work with Sphinx and are correctly formatted.
|
|
143
|
-
- Examples are always good especially if this a new feature or method.
|
|
144
|
-
- Think about a new user to the API trying to figure out how to use the features you're documenting.
|
|
145
|
-
3) Update the version value in `python-api/setup.py` to match the version you are packaging. This controls what version users will get when installing via pip.
|
|
146
|
-
4) Update the `__version__` value in `shotgun_api3/shotgun.py` to the version you're releasing. This identified the current version within the API itself.
|
|
147
|
-
5) Commit these changes in master with a commit message like `packaging for the vx.x.x release`.
|
|
148
|
-
6) Create a tag based off of the master branch called `vx.x.x` to match the version number you're releasing.
|
|
149
|
-
7) Push master and your tag to Github.
|
|
150
|
-
8) Update the Releases page with your new release.
|
|
151
|
-
- The release should already be there from your tag but if not, create a new one.
|
|
152
|
-
- Add more detailed information regarding the changes in this release. This is a great place to add examples, and reasons for the change!
|
|
153
|
-
|
|
154
|
-
### Letting the world know
|
|
155
|
-
Post a message in the [Pipeline Community channel](https://community.shotgridsoftware.com/c/pipeline).
|
|
156
|
-
|
|
157
|
-
### Prepare for the Next Dev Cycle
|
|
158
|
-
1) Update the `__version__` value in `shotgun_api3/shotgun.py` to the next version number with `.dev` appended to it. For example, `v3.0.24.dev`
|
|
159
|
-
2) Add a new section to the Changelog in the `HISTORY.rst` file with the next version number and a TBD date
|
|
160
|
-
```
|
|
161
|
-
**v3.0.24 - TBD**
|
|
162
|
-
+ TBD
|
|
163
|
-
```
|
|
164
|
-
3) Commit the changes to master with a commit message like `Bump version to v3.0.24.dev`
|
|
165
|
-
4) Push master to Github
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
[](http://www.vfxplatform.com/ "Supported VFX Platform")
|
|
2
|
+
[](https://www.python.org/ "Supported Python versions")
|
|
3
|
+
[](http://developer.shotgridsoftware.com/python-api)
|
|
4
|
+
|
|
5
|
+
[](https://dev.azure.com/shotgun-ecosystem/Python%20API/_build/latest?definitionId=108&branchName=master)
|
|
6
|
+
[](https://coveralls.io/github/shotgunsoftware/python-api?branch=master)
|
|
7
|
+
|
|
8
|
+
# Flow Production Tracking Python API
|
|
9
|
+
|
|
10
|
+
Autodesk provides a simple Python-based API for accessing Flow Production Tracking and integrating with other tools. This is the official API that is maintained by Autodesk (https://www.autodesk.com/support)
|
|
11
|
+
|
|
12
|
+
The latest version can always be found at http://github.com/shotgunsoftware/python-api
|
|
13
|
+
|
|
14
|
+
## Documentation
|
|
15
|
+
Tutorials and detailed documentation about the Python API are available at http://developer.shotgridsoftware.com/python-api).
|
|
16
|
+
|
|
17
|
+
Some useful direct links:
|
|
18
|
+
|
|
19
|
+
* [Installing](http://developer.shotgridsoftware.com/python-api/installation.html)
|
|
20
|
+
* [Tutorials](http://developer.shotgridsoftware.com/python-api/cookbook/tutorials.html)
|
|
21
|
+
* [API Reference](http://developer.shotgridsoftware.com/python-api/reference.html)
|
|
22
|
+
* [Data Types](http://developer.shotgridsoftware.com/python-api/reference.html#data-types)
|
|
23
|
+
* [Filter Syntax](http://developer.shotgridsoftware.com/python-api/reference.html#filter-syntax)
|
|
24
|
+
|
|
25
|
+
## Changelog
|
|
26
|
+
|
|
27
|
+
You can see the [full history of the Python API on the documentation site](http://developer.shotgridsoftware.com/python-api/changelog.html).
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
## Tests
|
|
31
|
+
|
|
32
|
+
Integration and unit tests are provided.
|
|
33
|
+
|
|
34
|
+
- All tests require:
|
|
35
|
+
- The [nose unit testing tools](http://nose.readthedocs.org),
|
|
36
|
+
- The [nose-exclude nose plugin](https://pypi.org/project/nose-exclude/)
|
|
37
|
+
- (Note: Running `pip install -r tests/ci_requirements.txt` will install this package)
|
|
38
|
+
- A `tests/config` file (you can copy an example from `tests/example_config`).
|
|
39
|
+
- Tests can be run individually like this: `nosetests --config="nose.cfg" tests/test_client.py`
|
|
40
|
+
- Make sure to not forget the `--config="nose.cfg"` option. This option tells nose to use our config file.
|
|
41
|
+
- `test_client` and `tests_unit` use mock server interaction and do not require a Flow Production Tracking instance to be available (no modifications to `tests/config` are necessary).
|
|
42
|
+
- `test_api` and `test_api_long` *do* require a Flow Production Tracking instance, with a script key available for the tests. The server and script user values must be supplied in the `tests/config` file. The tests will add test data to your server based on information in your config. This data will be manipulated by the tests, and should not be used for other purposes.
|
|
43
|
+
- To run all of the tests, use the shell script `run-tests`.
|
|
@@ -20,7 +20,7 @@ license = f.read().strip()
|
|
|
20
20
|
|
|
21
21
|
setup(
|
|
22
22
|
name="shotgun_api3",
|
|
23
|
-
version="3.
|
|
23
|
+
version="3.9.1",
|
|
24
24
|
description="Flow Production Tracking Python API",
|
|
25
25
|
long_description=readme,
|
|
26
26
|
long_description_content_type="text/markdown",
|
|
@@ -30,17 +30,17 @@ setup(
|
|
|
30
30
|
packages=find_packages(exclude=("tests",)),
|
|
31
31
|
script_args=sys.argv[1:],
|
|
32
32
|
include_package_data=True,
|
|
33
|
-
package_data={"": ["cacerts.txt", "cacert.pem"]},
|
|
33
|
+
package_data={"": ["cacerts.txt", "cacert.pem", "py.typed"]},
|
|
34
34
|
zip_safe=False,
|
|
35
|
-
python_requires=">=3.
|
|
35
|
+
python_requires=">=3.9.0",
|
|
36
36
|
classifiers=[
|
|
37
37
|
"Development Status :: 5 - Production/Stable",
|
|
38
38
|
"Intended Audience :: Developers",
|
|
39
39
|
"Programming Language :: Python",
|
|
40
|
-
"Programming Language :: Python :: 3.7",
|
|
41
40
|
"Programming Language :: Python :: 3.9",
|
|
42
41
|
"Programming Language :: Python :: 3.10",
|
|
43
42
|
"Programming Language :: Python :: 3.11",
|
|
43
|
+
"Programming Language :: Python :: 3.12",
|
|
44
44
|
"Operating System :: OS Independent",
|
|
45
45
|
],
|
|
46
46
|
)
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
# Copyright (c) 2019 Shotgun Software Inc.
|
|
2
|
+
#
|
|
3
|
+
# CONFIDENTIAL AND PROPRIETARY
|
|
4
|
+
#
|
|
5
|
+
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
|
|
6
|
+
# Source Code License included in this distribution package. See LICENSE.
|
|
7
|
+
# By accessing, using, copying or modifying this work you indicate your
|
|
8
|
+
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
|
|
9
|
+
# not expressly granted therein are reserved by Shotgun Software Inc.
|
|
10
|
+
|
|
11
|
+
import os
|
|
12
|
+
import sys
|
|
13
|
+
import warnings
|
|
14
|
+
|
|
15
|
+
if sys.version_info < (3, 7):
|
|
16
|
+
if os.environ.get("SHOTGUN_ALLOW_OLD_PYTHON", "0") != "1":
|
|
17
|
+
# This is our preferred default behavior when using an old
|
|
18
|
+
# unsupported Python version.
|
|
19
|
+
# This way, we can control where the exception is raised, and it provides a
|
|
20
|
+
# comprehensive error message rather than having users facing a random
|
|
21
|
+
# Python traceback and trying to understand this is due to using an
|
|
22
|
+
# unsupported Python version.
|
|
23
|
+
|
|
24
|
+
raise RuntimeError("This module requires Python version 3.7 or higher.")
|
|
25
|
+
|
|
26
|
+
warnings.warn(
|
|
27
|
+
"Python versions older than 3.7 are no longer supported as of January "
|
|
28
|
+
"2023. Since the SHOTGUN_ALLOW_OLD_PYTHON variable is enabled, this "
|
|
29
|
+
"module is raising a warning instead of an exception. "
|
|
30
|
+
"However, it is very likely that this module will not be able to work "
|
|
31
|
+
"on this Python version.",
|
|
32
|
+
RuntimeWarning,
|
|
33
|
+
stacklevel=2,
|
|
34
|
+
)
|
|
35
|
+
elif sys.version_info < (3, 9):
|
|
36
|
+
warnings.warn(
|
|
37
|
+
"Python versions older than 3.9 are no longer supported as of March "
|
|
38
|
+
"2025 and compatibility will be discontinued after March 2026. "
|
|
39
|
+
"Please update to Python 3.11 or any other supported version.",
|
|
40
|
+
DeprecationWarning,
|
|
41
|
+
stacklevel=2,
|
|
42
|
+
)
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
from .shotgun import (
|
|
46
|
+
Shotgun,
|
|
47
|
+
ShotgunError,
|
|
48
|
+
ShotgunFileDownloadError, # noqa unused imports
|
|
49
|
+
ShotgunThumbnailNotReady,
|
|
50
|
+
Fault,
|
|
51
|
+
AuthenticationFault,
|
|
52
|
+
MissingTwoFactorAuthenticationFault,
|
|
53
|
+
UserCredentialsNotAllowedForSSOAuthenticationFault,
|
|
54
|
+
ProtocolError,
|
|
55
|
+
ResponseError,
|
|
56
|
+
Error,
|
|
57
|
+
__version__,
|
|
58
|
+
)
|
|
59
|
+
from .shotgun import SG_TIMEZONE as sg_timezone # noqa unused imports
|
|
@@ -115,6 +115,7 @@ Below is a non-exhaustive list of things that we still need to implement:
|
|
|
115
115
|
"""
|
|
116
116
|
|
|
117
117
|
import datetime
|
|
118
|
+
from typing import Any
|
|
118
119
|
|
|
119
120
|
from ... import ShotgunError
|
|
120
121
|
from ...shotgun import _Config
|
|
@@ -177,7 +178,6 @@ class Shotgun(object):
|
|
|
177
178
|
api_key=None,
|
|
178
179
|
convert_datetimes_to_utc=True,
|
|
179
180
|
http_proxy=None,
|
|
180
|
-
ensure_ascii=True,
|
|
181
181
|
connect=True,
|
|
182
182
|
ca_certs=None,
|
|
183
183
|
login=None,
|
|
@@ -581,7 +581,7 @@ class Shotgun(object):
|
|
|
581
581
|
row[field] = default_value
|
|
582
582
|
return row
|
|
583
583
|
|
|
584
|
-
def _compare(self, field_type, lval, operator, rval):
|
|
584
|
+
def _compare(self, field_type: str, lval: Any, operator: str, rval: Any) -> bool:
|
|
585
585
|
"""
|
|
586
586
|
Compares a field using the operator and value provide by the filter.
|
|
587
587
|
|
|
@@ -798,7 +798,7 @@ class Shotgun(object):
|
|
|
798
798
|
|
|
799
799
|
return self._compare(field_type, lval, operator, rval)
|
|
800
800
|
|
|
801
|
-
def _rearrange_filters(self, filters):
|
|
801
|
+
def _rearrange_filters(self, filters: list) -> None:
|
|
802
802
|
"""
|
|
803
803
|
Modifies the filter syntax to turn it into a list of three items regardless
|
|
804
804
|
of the actual filter. Most of the filters are list of three elements, so this doesn't change much.
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
-----------------------------------------------------------------------------
|
|
31
31
|
"""
|
|
32
32
|
|
|
33
|
-
from ..six.moves import cPickle as pickle
|
|
34
33
|
import os
|
|
34
|
+
import pickle
|
|
35
35
|
|
|
36
36
|
from .errors import MockgunError
|
|
37
37
|
|
|
@@ -47,7 +47,7 @@ class SchemaFactory(object):
|
|
|
47
47
|
_schema_cache_path = None
|
|
48
48
|
|
|
49
49
|
@classmethod
|
|
50
|
-
def get_schemas(cls, schema_path, schema_entity_path):
|
|
50
|
+
def get_schemas(cls, schema_path: str, schema_entity_path: str) -> tuple:
|
|
51
51
|
"""
|
|
52
52
|
Retrieves the schemas from disk.
|
|
53
53
|
|
|
File without changes
|