Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix garbage collection for Shotgun instances #95

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.

Sign up for GitHub

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
bchapman wants to merge 1 commit into
base: master
Choose a base branch
Loading
from
Open

Fix garbage collection for Shotgun instances #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions 8 shotgun_api3/shotgun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,7 @@ def __init__(self,
proxy_addr = "http://%s%s:%d" % (auth_string, self.config.proxy_server, self.config.proxy_port)
self.config.proxy_handler = urllib2.ProxyHandler({self.config.scheme : proxy_addr})

if ensure_ascii:
self._json_loads = self._json_loads_ascii
self._ensure_ascii = ensure_ascii

self.client_caps = ClientCapabilities()
# this relies on self.client_caps being set first
Expand Down Expand Up @@ -2237,7 +2236,10 @@ def _decode_response(self, headers, body):
return body

def _json_loads(self, body):
return json.loads(body)
if self._ensure_ascii:
return self._json_loads_ascii(body)
else:
return json.loads(body)

def _json_loads_ascii(self, body):
""""See http://stackoverflow.com/questions/956867"""
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.