scratchattach 2.1.10a3__tar.gz → 2.1.12__tar.gz

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a3
+Version: 2.1.12
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/scratchattach/cloud/_base.py

@@ -142,7 +142,7 @@ class WebSocketEventStream(EventStream):
         i = 0
         with self.reading:
             try:
-                self.receive_new(True)
+                self.receive_new(amount != -1)
                 while (self.packets_left and amount == -1) or (amount != -1 and i < amount):
                     if not self.packets_left and amount != -1:
                         self.receive_new()
@@ -150,7 +150,7 @@ class WebSocketEventStream(EventStream):
                     i += 1
             except Exception:
                 self.source_cloud.reconnect()
-                self.receive_new(True)
+                self.receive_new(amount != -1)
                 while (self.packets_left and amount == -1) or (amount != -1 and i < amount):
                     if not self.packets_left and amount != -1:
                         self.receive_new()

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/scratchattach/eventhandlers/cloud_requests.py

@@ -23,7 +23,7 @@ class Request:
         self.enabled = enabled
         self.response_priority = response_priority
         self.cloud_requests = cloud_requests # the corresponding CloudRequests object
-        self.debug = debug
+        self.debug = debug or self.cloud_requests.debug
         
     def __call__(self, received_request):
         if not self.enabled:
@@ -63,7 +63,7 @@ class CloudRequests(CloudEvents):
 
     # The CloudRequests class is built upon CloudEvents, similar to how Filterbot is built upon MessageEvents
 
-    def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8", "9"], no_packet_loss=False, respond_order="receive"):
+    def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8", "9"], no_packet_loss=False, respond_order="receive", debug=False):
         super().__init__(cloud)
         # Setup
         self._requests = {}
@@ -73,6 +73,7 @@ class CloudRequests(CloudEvents):
         self.no_packet_loss = no_packet_loss # When enabled, query the clouddata log regularly for missed requests and reconnect after every single request (reduces packet loss a lot, but is spammy and can make response duration longer)
         self.used_cloud_vars = used_cloud_vars
         self.respond_order = respond_order
+        self.debug = debug
 
         # Lists and dicts for saving request-related stuff
         self.request_parts = {} # Dict (key: request_id) for saving the parts of the requests not fully received yet
@@ -99,7 +100,7 @@ class CloudRequests(CloudEvents):
 
     # -- Adding and removing requests --
 
-    def request(self, function=None, *, enabled=True, name=None, thread=True, response_priority=0):
+    def request(self, function=None, *, enabled=True, name=None, thread=True, response_priority=0, debug=False):
         """
         Decorator function. Adds a request to the request handler.
         """
@@ -113,7 +114,8 @@ class CloudRequests(CloudEvents):
                 thread=thread,
                 response_priority=response_priority,
                 on_call=function,
-                cloud_requests=self
+                cloud_requests=self,
+                debug=debug
             )
 
         if function is None:

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/scratchattach/site/activity.py

@@ -14,9 +14,9 @@ class Activity(BaseSiteComponent):
     """
 
     def __repr__(self):
-        return repr(self.raw)
+        return f"Activity({repr(self.raw)})"
 
-    def str(self):
+    def __str__(self):
         return str(self.raw)
 
     def __init__(self, **entries):

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/scratchattach/site/project.py

@@ -136,8 +136,6 @@ class PartialProject(BaseSiteComponent):
         """
         self._assert_auth()
 
-        global CREATE_PROJECT_USES
-
         if title is None:
             if "title" in self.__dict__:
                 title = self.title+" remix"

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/scratchattach.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a3
+Version: 2.1.12
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool

{scratchattach-2.1.10a3 → scratchattach-2.1.12}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '2.1.10a3'
+VERSION = '2.1.12'
 DESCRIPTION = 'A Scratch API Wrapper'
 LONG_DESCRIPTION = DESCRIPTION