mumuki-python-runner 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ac08925c7c447effe33a7cdadc6d8135d2a3d412586c546550630afe76e5db
-  data.tar.gz: 8b64922903b757f02e1df5714ee78c7dad8dfa5556d32a351396aab73e03c044
+  metadata.gz: f4a1cf971f4ce948e0e251e05f92672ca1c01e2b7f4441b60f57634c8cd89c68
+  data.tar.gz: 6bf96e4e38f596547ed4258c8447e8f6be826a8afedb75989fef278ea70a1664
 SHA512:
-  metadata.gz: cb86a2680d68c97a33028bf367b07918b8b64b41e85b8a588819bffe69afa621e033fcd2501ffe5fa0651c15de01e4851e31cc9e3d4084df80f820977f1dc6c1
-  data.tar.gz: c189e9eb01ea000eac2a8f24f8c4bd4b68e57cf4701f49e4984bd3b9be8f17eef47e4108be03ebd5124aa655138038adeb8c5442ca75f472d8a95b2dd12502c6
+  metadata.gz: f6340927de462b077cda6f61ea5dfb8b3bdc7ff1419abd8d59f623c33cac2f7c40eba7770a92b5a20c560b2e1e7b98d1343f668f93d9e6441e7c4d63c2b5669d
+  data.tar.gz: e5858f8ff89f2a13e1a1f65e265f4467a1e4017ed2c42bbbd92986e22436d54c46994c79e684384e1288a44ec3bb3dc492aaf305ab65adad08fc8223ceb5284b

data/lib/base/query_hook.rb

@@ -23,33 +23,13 @@ sys.stdout = sys.__stdout__
 python
   end
 
-  def compile_query(query, output_prefix = "=> ")
-    if query.match /print *(\(| ).*|.*[^=]=[^=].*|^raise\b/
-      query
-    else
-      <<~python
-        __mumuki_error__ = None
-        try:
-          __mumuki_args__ = {'mumuki_query_result': eval("""#{query.gsub('"', '\"')}""")}
-          print(string.Template(\"#{output_prefix}\${mumuki_query_result}\").safe_substitute(**__mumuki_args__))
-        except SyntaxError as e:
-          __mumuki_error__ = SyntaxError(e.msg, ('<console>', e.lineno, e.offset, e.text))
-        if __mumuki_error__:
-          print(__mumuki_error__.text)
-          print(" "*(__mumuki_error__.offset - 1) + "^")
-          print('SyntheticMumukiSyntaxError: SyntaxError: ' + str(__mumuki_error__))
-          exit(1)
-      python
-    end
-  end
-
   def compile_state(cookie)
     (cookie||[]).map do |statement|
-    <<~python
-    try:
-      #{statement}
-    except:
-      pass
+<<~python
+try:
+  #{statement}
+except:
+  pass
 python
     end
   end
@@ -65,13 +45,6 @@ python
   end
 
   def syntax_error_regexp
-    /(SyntheticMumukiSyntaxError: )|(\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError)))/
+    /(SyntheticMumukiSyntaxError: )|((\A  File .*\n)?(?m)(?=.*(SyntaxError|IndentationError)))/
   end
 end
-
-
-
-
-
-
-

data/lib/base/version.rb

@@ -1,4 +1,4 @@
 
 module BasePythonVersionHook
-  VERSION = '1.7.1'
+  VERSION = '1.8.0'
 end

data/lib/python2/query_hook.rb

@@ -1,4 +1,23 @@
 class Python2QueryHook < BasePythonQueryHook
+  def compile_query(query, output_prefix = "=> ")
+    if query.match /print *(\(| ).*|.*[^=><!]=[^=].*|^raise\b/
+      query
+    else
+<<~python
+  __mumuki_error__ = None
+  try:
+    __mumuki_args__ = {'mumuki_query_result': eval("""#{query.gsub('"', '\"')}""")}
+    print(string.Template(\"\${mumuki_query_result}\").safe_substitute(**__mumuki_args__))
+  except SyntaxError as e:
+    __mumuki_error__ = SyntaxError(e.msg, ('<console>', e.lineno, e.offset, e.text))
+  if __mumuki_error__:
+    print(__mumuki_error__.text)
+    print(" "*(__mumuki_error__.offset - 1) + "^")
+    print('SyntheticMumukiSyntaxError: SyntaxError: ' + str(__mumuki_error__))
+    exit(1)
+python
+    end
+  end
 end
 
 PythonQueryHook = Python2QueryHook

data/lib/python3/query_hook.rb

@@ -1,2 +1,24 @@
 class Python3QueryHook < BasePythonQueryHook
+  def compile_query(query, output_prefix = "=> ")
+<<~python
+import code
+import itertools
+import traceback
+import sys
+
+__mumuki_console__ = code.InteractiveConsole()
+
+try:
+  __mumuki_result__ = __mumuki_console__.compile("""#{query.gsub('"', '\"')}""")
+  if __mumuki_result__ != None:
+    exec(__mumuki_result__)
+  else:
+    raise SyntaxError('unexpected EOF while parsing')
+except:
+  error = sys.exc_info()
+  stack = traceback.format_exception(*error)
+  print(*itertools.dropwhile(lambda it: 'File "<input>"' not in it and not it.startswith("SyntaxError"), stack))
+  exit(1)
+python
+  end
 end

data/lib/python3/try_hook.rb

@@ -45,4 +45,9 @@ python
   def to_query_result(result, status)
     { result: result, status: status }
   end
+
+  def checker_options
+    { strip_mode: :right_only }
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '2.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '2.41'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement