update r768

tools/paiza.io/Makefile

@@ -3,7 +3,7 @@
 
 .PHONY: sample
 
-TOOLS=pypaiza.py iupaiza.py
+TOOLS=paiza.py iupaiza.py
 
 WANDBOX_COMPILER?=gcc-head
 

tools/paiza.io/iupaiza.py

@@ -8,10 +8,10 @@
 import re
 import codecs
 import argparse
-import pypaiza
+import paiza
 
 from argparse import ArgumentParser
-from pypaiza import PaizaIO
+from paiza import PaizaIO
 
 IUTEST_FUSED_SRC = os.path.join(os.path.dirname(__file__), '../../fused-src/iutest.min.hpp')
 IUTEST_INCLUDE_REGEX = re.compile(r'^\s*#\s*include\s*".*iutest\.hpp"')
@@ -48,7 +48,7 @@ def parse_command_line():
 	parser.add_argument(
 		'code'
 		, metavar='CODE'
-			, help = 'Source code file'
+			, help = 'source code file'
 		, nargs='?'
 	)
 	if len(sys.argv) <= 1:

tools/paiza.io/pypaiza.py → tools/paiza.io/paiza.py

@@ -1,91 +1,91 @@
-#!/usr/bin/env python
-#
-# pypaiza.py
-#
-
-import requests
-import json;
-
-#
-#
-#
-class PaizaIO:
-	"""wandbox api class"""
-	api_url = 'http://api.paiza.io/'
-	parameter = { 'source_code':'', 'language':'cpp', 'api_key':'guest' }
-	session_id = ''
-
-	def create(self):
-		headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-		payload = json.dumps(self.parameter)
-		r = requests.post(self.api_url + 'runners/create/', data=payload, headers=headers)
-		r.raise_for_status()
-		result = r.json()
-		if 'error' in result:
-			if not 'longpoll timeout' in result['error']:
-				print result['error']
-				print result
-				raise
-
-		if 'id' in result:
-			self.session_id = result['id']
-		else:
-			print result
-			raise
-		return result
-
-	def get_status(self):
-		headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-		parameter = { 'id': self.session_id, 'api_key':self.parameter['api_key'] }
-		payload = json.dumps(parameter)
-		r = requests.get(self.api_url + 'runners/get_status/', data=payload, headers=headers)
-		r.raise_for_status()
-		return r.json()
-
-	def get_details(self):
-		headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-		parameter = { 'id': self.session_id, 'api_key':self.parameter['api_key'] }
-		payload = json.dumps(parameter)
-		r = requests.get(self.api_url + 'runners/get_details/', data=payload, headers=headers)
-		r.raise_for_status()
-		return r.json()
-
-	def is_completed(self, r):
-		if 'status' in r:
-			return r['status'] == 'completed'
-		return False
-
-	def wait_complete(self):
-		r = self.get_status()
-		while not self.is_completed(r):
-			r = self.get_status()
-
-	def run(self):
-		r = self.create()
-		while not self.is_completed(r):
-			r = self.get_status()
-		return self.get_details()
-
-	def language(language, str):
-		self.parameter.update({'language':str})
-	def source_code(source_code, str):
-		self.parameter.update({'source_code':str})
-	def code(self, str):
-		self.parameter.update({'source_code':str})
-	def input(self, str):
-		self.parameter.update({'input':str})
-	def stdin(self, str):
-		self.parameter.update({'input':str})
-	def longpoll(self, b):
-		self.parameter.update({'longpoll':b})
-	def longpoll_timeout(self, t):
-		self.parameter.update({'longpoll_timeout':t})
-
-	def dump(self):
-		print self.parameter
-
-if __name__ == '__main__':
-	paiza = PaizaIO()
-	paiza.code('#include <iostream>\nint main() { int x = 0; std::cout << "hoge" << std::endl; }')
-	print paiza.run()
-
+#!/usr/bin/env python
+#
+# pypaiza.py
+#
+
+import requests
+import json
+
+#
+#
+#
+class PaizaIO:
+	"""wandbox api class"""
+	api_url = 'http://api.paiza.io/'
+	parameter = { 'source_code':'', 'language':'cpp', 'api_key':'guest' }
+	session_id = ''
+
+	def create(self):
+		headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+		payload = json.dumps(self.parameter)
+		r = requests.post(self.api_url + 'runners/create/', data=payload, headers=headers)
+		r.raise_for_status()
+		result = r.json()
+		if 'error' in result:
+			if not 'longpoll timeout' in result['error']:
+				print result['error']
+				print result
+				raise
+
+		if 'id' in result:
+			self.session_id = result['id']
+		else:
+			print result
+			raise
+		return result
+
+	def get_status(self):
+		headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+		parameter = { 'id': self.session_id, 'api_key':self.parameter['api_key'] }
+		payload = json.dumps(parameter)
+		r = requests.get(self.api_url + 'runners/get_status/', data=payload, headers=headers)
+		r.raise_for_status()
+		return r.json()
+
+	def get_details(self):
+		headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+		parameter = { 'id': self.session_id, 'api_key':self.parameter['api_key'] }
+		payload = json.dumps(parameter)
+		r = requests.get(self.api_url + 'runners/get_details/', data=payload, headers=headers)
+		r.raise_for_status()
+		return r.json()
+
+	def is_completed(self, r):
+		if 'status' in r:
+			return r['status'] == 'completed'
+		return False
+
+	def wait_complete(self):
+		r = self.get_status()
+		while not self.is_completed(r):
+			r = self.get_status()
+
+	def run(self):
+		r = self.create()
+		while not self.is_completed(r):
+			r = self.get_status()
+		return self.get_details()
+
+	def language(language, str):
+		self.parameter.update({'language':str})
+	def source_code(source_code, str):
+		self.parameter.update({'source_code':str})
+	def code(self, str):
+		self.parameter.update({'source_code':str})
+	def input(self, str):
+		self.parameter.update({'input':str})
+	def stdin(self, str):
+		self.parameter.update({'input':str})
+	def longpoll(self, b):
+		self.parameter.update({'longpoll':b})
+	def longpoll_timeout(self, t):
+		self.parameter.update({'longpoll_timeout':t})
+
+	def dump(self):
+		print self.parameter
+
+if __name__ == '__main__':
+	paiza = PaizaIO()
+	paiza.code('#include <iostream>\nint main() { int x = 0; std::cout << "hoge" << std::endl; }')
+	print paiza.run()
+

tools/wandbox/Makefile

@@ -3,7 +3,7 @@
 
 .PHONY: sample
 
-TOOLS=pywandbox.py iuwandbox.py
+TOOLS=wandbox.py iuwandbox.py
 
 WANDBOX_COMPILER?=gcc-head