From e324d03e6d929c8adaba0f74f2d80b4052a86fa4 Mon Sep 17 00:00:00 2001 From: blob8108 Date: Sat, 11 Jan 2014 12:21:23 +0000 Subject: Replace ridiculous "optional" argument `is_browser` --- blockext/__init__.py | 4 +--- blockext/scratch.py | 2 +- blockext/snap.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/blockext/__init__.py b/blockext/__init__.py index 40427d7..0581cd3 100644 --- a/blockext/__init__.py +++ b/blockext/__init__.py @@ -94,10 +94,8 @@ class Blockext(BaseHTTPRequestHandler): if isinstance(func, Block): response = func(*args) mime_type = "text/plain" - elif "is_browser" in inspect.getargspec(func).args: - (mime_type, response) = func(is_browser=is_browser, *args) else: - (mime_type, response) = func(*args) + (mime_type, response) = func(is_browser=is_browser, *args) status = 200 else: response = "ERROR: Not found" diff --git a/blockext/scratch.py b/blockext/scratch.py index a812028..34d4d81 100644 --- a/blockext/scratch.py +++ b/blockext/scratch.py @@ -24,7 +24,7 @@ BLOCK_SHAPES = { } @handler("scratch_{filename}.s2e", display="Download Scratch 2.0 extension") -def generate_s2e(): +def generate_s2e(is_browser=False): extension = { "extensionName": Blockext.name, "extensionPort": Blockext.port, diff --git a/blockext/snap.py b/blockext/snap.py index d3fbe52..75c86d9 100644 --- a/blockext/snap.py +++ b/blockext/snap.py @@ -21,7 +21,7 @@ def pretty(stuff): return xml.toprettyxml() @handler("snap_{filename}.xml", display="Download Snap! blocks") -def generate_xml(): +def generate_xml(is_browser=False): root = Element("blocks", { "app": "Snap! 4.0, http://snap.berkeley.edu", "version": "1", -- cgit v1.3.1