fix htaccess bytes string

OnToology/autoncore.py

@@ -118,6 +118,7 @@ def init_g():
         g = Github(username, password)
     return g
 
+
 def git_magic(target_repo, user, changed_filesss, branch, raise_exp=False):
     """
     :param target_repo: user/reponame
@@ -130,7 +131,7 @@ def git_magic(target_repo, user, changed_filesss, branch, raise_exp=False):
     global parent_folder
     global log_file_dir
 
-    print("\n\n\n In gitmagic print")
+    print("\n\n\n In gitmagic print: user <%s>" % str(user))
     logger_fname = prepare_logger(user)
     parent_folder = user
     if not settings.test_conf['local']:
@@ -1011,7 +1012,9 @@ def publish(name, target_repo, ontology_rel_path, useremail):
                     return error_msg
             dolog("publish> htaccess content: ")
             dolog(str(type(htaccess)))
-            htaccess = str(htaccess)
+            if isinstance(htaccess, bytes):
+                htaccess = htaccess.decode('utf-8')
+            # htaccess = str(htaccess)
             dolog(str(type(htaccess)))
             dolog(htaccess)
             new_htaccess = htaccess_github_rewrite(target_repo=target_repo, htaccess_content=htaccess,

OnToology/rabbit.py

@@ -84,6 +84,7 @@ def run_rabbit():
 #     """
 #     return direct_call(message_json)
 
+
 def send(message_json):
     """
     :param message:
@@ -164,7 +165,6 @@ def get_num_of_processes_of_rabbit():
     return -1
 
 
-
 def direct_call(j):
     """
     Consume messages from the ready queue
@@ -200,7 +200,6 @@ def direct_call(j):
         return False
 
 
-
 def callback_consumer(lock, sender, receiver, logger, j):
     # lock = extra['lock']
     # logger = extra['logger']
@@ -231,6 +230,7 @@ def callback_consumer(lock, sender, receiver, logger, j):
     lock.release()
     logger.debug("")
 
+
 def callback2(extra, ch, method, properties, body):
     """
     Consume messages from the ready queue