Michał Górny avatar Michał Górny committed a244c8a

Fix python3 support.

Comments (0)

Files changed (1)

SmartLiveRebuild/core.py

 
 	def __call__(self, vars):
 		# File ready, now ping the server...
-		self._bashproc.stdin.write('%s\n' % ' '.join(['"${%s}"' % x for x in vars]))
+		self._bashproc.stdin.write(('%s\n' % ' '.join(['"${%s}"' % x for x in vars])).encode('ASCII'))
 		self._bashproc.stdin.flush()
 
 		# ...and grab the output (hopefully, we're in non-blocking mode).
-		l = ''
-		while len(l.split('\0')) <= len(vars):
+		l = bytes()
+		spl = []
+		while len(spl) <= len(vars):
 			try:
-				l += self._bashproc.stdout.read()
+				ret = self._bashproc.stdout.read()
+				if ret is None:
+					continue
+				l += ret
 			except IOError as e:
 				if e.errno not in (errno.EAGAIN, errno.EWOULDBLOCK):
 					raise
+			else:
+				try:
+					spl = l.decode('utf8').split('\0')
+				except UnicodeError:
+					# got stuck in the middle of a character?
+					spl = []
 
-		return dict(zip(vars, l.split('\0')))
+		return dict(zip(vars, spl))
 
 	def terminate(self):
 		self._bashproc.terminate()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.