scratchattach 2.1.7__tar.gz → 2.1.9__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.
Files changed (45) hide show
  1. {scratchattach-2.1.7 → scratchattach-2.1.9}/PKG-INFO +1 -1
  2. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/cloud/_base.py +2 -2
  3. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/session.py +1 -0
  4. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/utils/requests.py +3 -2
  5. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach.egg-info/PKG-INFO +1 -1
  6. {scratchattach-2.1.7 → scratchattach-2.1.9}/setup.py +1 -1
  7. {scratchattach-2.1.7 → scratchattach-2.1.9}/LICENSE +0 -0
  8. {scratchattach-2.1.7 → scratchattach-2.1.9}/README.md +0 -0
  9. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/__init__.py +0 -0
  10. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/cloud/__init__.py +0 -0
  11. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/cloud/cloud.py +0 -0
  12. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/__init__.py +0 -0
  13. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/_base.py +0 -0
  14. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/cloud_events.py +0 -0
  15. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/cloud_recorder.py +0 -0
  16. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/cloud_requests.py +0 -0
  17. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/cloud_server.py +0 -0
  18. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/cloud_storage.py +0 -0
  19. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/combine.py +0 -0
  20. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/filterbot.py +0 -0
  21. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/eventhandlers/message_events.py +0 -0
  22. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/other/__init__.py +0 -0
  23. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/other/other_apis.py +0 -0
  24. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/other/project_json_capabilities.py +0 -0
  25. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/__init__.py +0 -0
  26. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/_base.py +0 -0
  27. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/activity.py +0 -0
  28. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/backpack_asset.py +0 -0
  29. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/classroom.py +0 -0
  30. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/cloud_activity.py +0 -0
  31. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/comment.py +0 -0
  32. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/forum.py +0 -0
  33. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/project.py +0 -0
  34. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/studio.py +0 -0
  35. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/site/user.py +0 -0
  36. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/utils/__init__.py +0 -0
  37. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/utils/commons.py +0 -0
  38. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/utils/encoder.py +0 -0
  39. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/utils/enums.py +0 -0
  40. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach/utils/exceptions.py +0 -0
  41. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach.egg-info/SOURCES.txt +0 -0
  42. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach.egg-info/dependency_links.txt +0 -0
  43. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach.egg-info/requires.txt +0 -0
  44. {scratchattach-2.1.7 → scratchattach-2.1.9}/scratchattach.egg-info/top_level.txt +0 -0
  45. {scratchattach-2.1.7 → scratchattach-2.1.9}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: scratchattach
3
- Version: 2.1.7
3
+ Version: 2.1.9
4
4
  Summary: A Scratch API Wrapper
5
5
  Home-page: https://scratchattach.tim1de.net
6
6
  Author: TimMcCool
@@ -48,10 +48,10 @@ class BaseCloud(ABC):
48
48
  :self.print_connect_messages: Whether to print a message on every connect to the cloud server. Defaults to False.
49
49
  """
50
50
 
51
- def __init__(self):
51
+ def __init__(self, *, _session=None):
52
52
 
53
53
  # Required internal attributes that every object representing a cloud needs to have (no matter what cloud is represented):
54
- self._session = None
54
+ self._session = _session
55
55
  self.active_connection = False #whether a connection to a cloud variable server is currently established
56
56
  self.websocket = websocket.WebSocket(sslopt={"cert_reqs": ssl.CERT_NONE})
57
57
  self.recorder = None # A CloudRecorder object that records cloud activity for the values to be retrieved later will be saved in this attribute as soon as .get_var is called
@@ -839,6 +839,7 @@ def login(username, password, *, timeout=10) -> Session:
839
839
  request = requests.post(
840
840
  "https://scratch.mit.edu/login/", data=data, headers=_headers,
841
841
  timeout = timeout,
842
+ errorhandling = False
842
843
  )
843
844
  try:
844
845
  session_id = str(re.search('"(.*)"', request.headers["Set-Cookie"]).group())
@@ -31,12 +31,13 @@ class Requests:
31
31
  return r
32
32
 
33
33
  @staticmethod
34
- def post(url, *, data=None, json=None, headers=None, cookies=None, timeout=None, params=None):
34
+ def post(url, *, data=None, json=None, headers=None, cookies=None, timeout=None, params=None, errorhandling=True):
35
35
  try:
36
36
  r = requests.post(url, data=data, json=json, headers=headers, cookies=cookies, params=params, timeout=timeout, proxies=proxies)
37
37
  except Exception as e:
38
38
  raise exceptions.FetchError(e)
39
- Requests.check_response(r)
39
+ if errorhandling:
40
+ Requests.check_response(r)
40
41
  return r
41
42
 
42
43
  @staticmethod
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: scratchattach
3
- Version: 2.1.7
3
+ Version: 2.1.9
4
4
  Summary: A Scratch API Wrapper
5
5
  Home-page: https://scratchattach.tim1de.net
6
6
  Author: TimMcCool
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
  import codecs
3
3
  import os
4
4
 
5
- VERSION = '2.1.7'
5
+ VERSION = '2.1.9'
6
6
  DESCRIPTION = 'A Scratch API Wrapper'
7
7
  LONG_DESCRIPTION = DESCRIPTION
8
8
 
File without changes
File without changes
File without changes