Skip to content

SG-38306 Python2 Removal - Part 9 - six module #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: ticket/SG-38306-python2-ensure-ascii
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion 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==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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's only possible if shotgunsoftware/tk-core#1042 is merged and released first

This file was deleted.

Loading
Loading