Added methods for AbstractRuntime

doloopwhile · doloopwhile · commit c4e58bb5c593 · 2016-03-20T14:52:12.000+09:00
diff --git a/execjs/_abstract_runtime.py b/execjs/_abstract_runtime.py
@@ -12,27 +12,23 @@ def exec_(self, source, cwd=None):
 '''Execute source by JavaScript runtime and return all output to stdout as a string.
 
 source -- JavaScript code to execute.
- cwd -- Directory where call JavaScript runtime. It may be ignored for some runtime.
+ cwd -- Directory where call JavaScript runtime. It may be ignored in some derived class.
 '''
- if not self.is_available():
- raise execjs.RuntimeUnavailableError
- return self._exec_(source, cwd=cwd)
+ return self.compile('', cwd=cwd).exec_(source)
 
 def eval(self, source, cwd=None):
 '''Evaluate source in JavaScript runtime.
 
 source -- JavaScript code to evaluate.
- cwd -- Directory where call JavaScript runtime. It may be ignored for some runtime.
+ cwd -- Directory where call JavaScript runtime. It may be ignored in some derived class.
 '''
- if not self.is_available():
- raise execjs.RuntimeUnavailableError
- return self._eval(source, cwd=cwd)
+ return self.compile('', cwd=cwd).eval(source)
 
 def compile(self, source, cwd=None):
 '''Bulk source as a context object. The source can be used to execute another code.
 
 source -- JavaScript code to bulk.
- cwd -- Directory where call JavaScript runtime. It may be ignored for some runtime.
+ cwd -- Directory where call JavaScript runtime. It may be ignored in some derived class.
 '''
 if not self.is_available():
 raise execjs.RuntimeUnavailableError
@@ -42,14 +38,6 @@ def compile(self, source, cwd=None):
 def is_available(self):
 raise NotImplementedError
 
- @abstractmethod
- def _exec_(self, source, cwd=None):
- raise NotImplementedError
-
 @abstractmethod
 def _compile(self, source, cwd=None):
 raise NotImplementedError
-
- @abstractmethod
- def _eval(self, source, cwd=None):
- raise NotImplementedError
diff --git a/execjs/_external_runtime.py b/execjs/_external_runtime.py
@@ -44,12 +44,6 @@ def name(self):
 def is_available(self):
 return self._available
 
- def _exec_(self, source, cwd=None):
- return self.Context(self, cwd=cwd).exec_(source)
-
- def _eval(self, source, cwd=None):
- return self.Context(self, cwd=cwd).eval(source)
-
 def _compile(self, source, cwd=None):
 return self.Context(self, source, cwd=cwd)
 
diff --git a/execjs/_pyv8runtime.py b/execjs/_pyv8runtime.py
@@ -23,12 +23,6 @@ def __init__(self):
 def name(self):
 return "PyV8"
 
- def _exec_(self, source, cwd=None):
- return self.Context().exec_(source)
-
- def _eval(self, source, cwd=None):
- return self.Context().eval(source)
-
 def _compile(self, source, cwd=None):
 return self.Context(source)
 

-Original file line number
+Diff line change
 '''Execute source by JavaScript runtime and return all output to stdout as a string.
  source -- JavaScript code to execute.
 - cwd -- Directory where call JavaScript runtime. It may be ignored for some runtime.
 + cwd -- Directory where call JavaScript runtime. It may be ignored in some derived class.
  '''
 -ifnotself.is_available():
 -raiseexecjs.RuntimeUnavailableError
 -returnself._exec_(source, cwd=cwd)
 +returnself.compile('', cwd=cwd).exec_(source)
 defeval(self, source, cwd=None):
 '''Evaluate source in JavaScript runtime.
  source -- JavaScript code to evaluate.
 - cwd -- Directory where call JavaScript runtime. It may be ignored for some runtime.
 + cwd -- Directory where call JavaScript runtime. It may be ignored in some derived class.
  '''
 -ifnotself.is_available():
 -raiseexecjs.RuntimeUnavailableError
 -returnself._eval(source, cwd=cwd)
 +returnself.compile('', cwd=cwd).eval(source)
 defcompile(self, source, cwd=None):
 '''Bulk source as a context object. The source can be used to execute another code.
  source -- JavaScript code to bulk.
 - cwd -- Directory where call JavaScript runtime. It may be ignored for some runtime.
 + cwd -- Directory where call JavaScript runtime. It may be ignored in some derived class.
  '''
 ifnotself.is_available():
 raiseexecjs.RuntimeUnavailableError
 defis_available(self):
 raiseNotImplementedError
 -@abstractmethod
 -def_exec_(self, source, cwd=None):
 -raiseNotImplementedError
+-
 @abstractmethod
 def_compile(self, source, cwd=None):
 raiseNotImplementedError
+-
 -@abstractmethod
 -def_eval(self, source, cwd=None):
 -raiseNotImplementedError