Merge pull request #83 from dvinokurov/issue79

Fixed error while generating message before creating project from SBT

dotensime.py

@@ -119,7 +119,7 @@ def is_sbt(self, project_root):
       return has_sbt_files_in_root or has_project_subfolder
 
     def confirm_sbt(self, project_root):
-      message = "It looks like " + str(project_root) + " is a home of an SBT project. "
+      message = "It looks like " + encode_if_unicode(project_root) + " is a home of an SBT project. "
       message += "\n\n"
       message += "That's great news, because you can have Ensime configuration generated by SBT. "
       message += "And even better: this generation can be done automatically by Sublime. "
@@ -133,7 +133,7 @@ def confirm_sbt(self, project_root):
       message += "run Tools > Ensime > Maintenance > Create project from scratch."
       message += "\n\n"
       message += "Do you wish to proceed?"
-      return sublime.ok_cancel_dialog(message)
+      return sublime.ok_cancel_dialog(decode_if_str(message))
 
     def fill_in_dot_ensime_with_pre_sbt_mock_config(self, project_root):
       message = ";; Sublime is about to run the following commands:\n"

ensime.py

@@ -77,7 +77,7 @@ def log_on_ui_thread(self, flavor, data):
 
   def prepare_log_message(self, data):
     buffer = "["+str(datetime.datetime.now())+"]: "
-    buffer += data.strip().encode("utf-8") if isinstance(data.strip(), unicode) else data.strip()
+    buffer += encode_if_unicode(data.strip())
     buffer += "\n"
     return buffer
 
@@ -482,7 +482,7 @@ def async_req(self, to_send, on_complete = None, call_back_into_ui_thread = None
 
     self.feedback(msg_str)
     self.log_client("SEND ASYNC REQ: " + msg_str)
-    self.socket.send(msg_str.encode('utf-8') if isinstance(msg_str, unicode) else msg_str)
+    self.socket.send(encode_if_unicode(msg_str))
 
   def sync_req(self, to_send, timeout=0):
     msg_id = self.next_message_id()

strings.py

@@ -0,0 +1,9 @@
+def encode_if_unicode(arg):
+  if isinstance(arg,list):
+  	return [encode_if_unicode(elem) for elem in arg]
+  return arg.encode("utf-8") if isinstance(arg, unicode) else arg
+
+def decode_if_str(arg):
+  if isinstance(arg,list):
+  	return [decode_if_str(elem) for elem in arg]
+  return arg.decode("utf-8") if isinstance(arg, str) else arg