Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
999d92d
Import order
julien-lang Jul 16, 2025
9777db0
Remove __future__ imports
julien-lang Jul 16, 2025
e3e72cd
Cleanup super prototype
julien-lang Jul 16, 2025
2e3b54b
six.iter....
julien-lang Jul 16, 2025
64fa354
Remove calls to six.text_type and six.binary_type
julien-lang Jul 16, 2025
d014745
Remove calls to ensure_bytes, ensure_text, ensure_strings
julien-lang Jul 16, 2025
153f179
test fixed
eduardoChaucaGallegos Jul 17, 2025
2de2822
fixup! test fixed
julien-lang Jul 17, 2025
24835e3
Black
julien-lang Jul 17, 2025
60bb0bc
Update shotgun_api3/shotgun.py
julien-lang Jul 17, 2025
473b811
six.moves imports
julien-lang Jul 16, 2025
f68f1ae
Cleanup BytesIO import from six
julien-lang Jul 16, 2025
0b956cc
simple json
julien-lang Jul 16, 2025
b94da1a
Cleanup Py2-3 compat with ImportError
julien-lang Jul 16, 2025
6e89b98
Simplify Base64
julien-lang Jul 16, 2025
439d0b3
fixup! six.moves imports
julien-lang Jul 17, 2025
adbc0da
fixup! six.moves imports
julien-lang Jul 17, 2025
c4d1e30
Remove deprecated custome mimetype module
julien-lang Jul 16, 2025
e93ed1e
Remove deprecated backported mock module
julien-lang Jul 16, 2025
12f1abe
Fixup assert_called_once
julien-lang Jul 17, 2025
ea953d2
Fixup CI tests
julien-lang Jul 17, 2025
f45faac
fixup! Fixup CI tests
julien-lang Jul 17, 2025
6a2b3e2
provides debug info
julien-lang Jul 17, 2025
cb800c1
fixup! provides debug info
julien-lang Jul 17, 2025
a4afffa
fixup! Remove deprecated backported mock module
julien-lang Jul 17, 2025
77c9cd3
Remove python2 from httplib2 module
julien-lang Jul 16, 2025
6124681
fixup issue with ssl_error_classes
julien-lang Jul 17, 2025
10119ec
Cleanup six.PY2/six.PY3 conditions
julien-lang Jul 16, 2025
c9648c1
Remove useless test in Python 3
julien-lang Jul 16, 2025
e7ca1eb
Replace sgsix.file_types by io.IOBase
julien-lang Jul 16, 2025
3cbc5ff
Replace ShotgunSSLError by ssl.SSLError
julien-lang Jul 16, 2025
5d8b18d
Cleanup Python-2 related comments and workarounds
julien-lang Jul 17, 2025
b90a64b
fixup! Cleanup six.PY2/six.PY3 conditions
julien-lang Jul 17, 2025
f6275cd
Remove deprecated ensure_ascii parameter from SG object
julien-lang Jul 16, 2025
5c4dc5b
fixup! Remove deprecated ensure_ascii parameter from SG object
julien-lang Jul 17, 2025
c321734
Test CI
julien-lang Jul 17, 2025
1f370fe
fixup! Test CI
julien-lang Jul 17, 2025
2eb8306
fixup! fixup! Test CI
julien-lang Jul 17, 2025
1463852
fixup! fixup! fixup! Test CI
julien-lang Jul 17, 2025
da922f9
fixup! fixup! fixup! fixup! Test CI
julien-lang Jul 17, 2025
c03452a
Remove now unsused sgutils
julien-lang Jul 16, 2025
dc934f5
Remove now useless sgsix module
julien-lang Jul 16, 2025
9a131fa
Remove six module
julien-lang Jul 16, 2025
abbc531
pulling from master and conflicts fixed
eduardoChaucaGallegos Sep 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
source=shotgun_api3
omit=
shotgun_api3/lib/httplib2/*
shotgun_api3/lib/six.py
shotgun_api3/lib/certify/*
shotgun_api3/lib/pyparsing.py
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

[flake8]
max-line-length = 120
exclude = shotgun_api3/lib/httplib2/*,shotgun_api3/lib/six.py,tests/httplib2test.py
exclude = shotgun_api3/lib/httplib2/*,tests/httplib2test.py
1 change: 0 additions & 1 deletion docs/cookbook/examples/ami_handler.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ via ``POST``. If you're using a custom protocol the data is sent via ``GET``.
# Imports
# ---------------------------------------------------------------------------------------------
import sys, os
import six
import logging as logger

# ---------------------------------------------------------------------------------------------
Expand Down
10 changes: 0 additions & 10 deletions shotgun_api3/lib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,8 @@ Some third-party modules are bundled with `python-api` inside lib.

The version of `httplib2` bundled should be updated manually, however its version is included in the unused `shotgun_api3/lib/requirements.txt` to allow Github's automated CVE notifications to work.

### six

Six is a Python 2/3 compatibility library. In python-api, it's used to make simultaneous support for Python on 2 and 3 easier to maintain and more readable, but allowing the use of common helper functions, unified interfaces for modules that changed, and variables to ease type comparisons. For more on six, see the [documentation](https://six.readthedocs.io/).

The version of `six` bundled should be updated manually, however its version is included in the unused `shotgun_api3/lib/requirements.txt` to allow Github's automated CVE notifications to work.

## Flow Production Tracking Modules

### sgsix

`sgsix` is a module that contains extensions to `six`. These might be additional helper functions, variables, etc. that supplement six's functionality. It is intended that `sgsix` can be used within other packages that include or depend on the `python-api` package as well.

### sgtimezone

`sgtimezone` contains classes for easing the conversion between the server (UTC) timezone and client timezone.
Expand Down
3 changes: 1 addition & 2 deletions shotgun_api3/lib/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@
# This file is unused. It is left there so Github can warn us is a CVE is
# released for our dependencies.
httplib2==0.22.0
six==1.13.0
certifi==2025.7.14
certifi==2024.7.4
pyparsing==2.4.7
87 changes: 0 additions & 87 deletions shotgun_api3/lib/sgsix.py

This file was deleted.

62 changes: 0 additions & 62 deletions shotgun_api3/lib/sgutils.py

This file was deleted.

Loading
Loading