diff --git a/src/Connection/Connection.py b/src/Connection/Connection.py index 1a7b54b1..2c16ce68 100644 --- a/src/Connection/Connection.py +++ b/src/Connection/Connection.py @@ -262,7 +262,7 @@ class Connection(object): self.handleHandshake(message) else: self.server.handleRequest(self, message) - else: # Old style response, no req_id definied + else: # Old style response, no req_id defined if config.debug_socket: self.log("Unknown message: %s, waiting: %s" % (message, self.waiting_requests.keys())) if self.waiting_requests: diff --git a/src/Content/ContentManager.py b/src/Content/ContentManager.py index eda99c24..be97b985 100644 --- a/src/Content/ContentManager.py +++ b/src/Content/ContentManager.py @@ -320,7 +320,7 @@ class ContentManager(object): elif optional_pattern and re.match(optional_pattern, file_relative_path): optional = True - if ignored: # Ignore content.json, definied regexp and files starting with . + if ignored: # Ignore content.json, defined regexp and files starting with . self.log.info("- [SKIPPED] %s" % file_relative_path) else: file_path = self.site.storage.getPath(dir_inner_path + "/" + file_relative_path) diff --git a/src/Debug/DebugMedia.py b/src/Debug/DebugMedia.py index 9440166a..15e65042 100644 --- a/src/Debug/DebugMedia.py +++ b/src/Debug/DebugMedia.py @@ -81,7 +81,7 @@ def merge(merged_path): if config.coffeescript_compiler is None: config.coffeescript_compiler = findCoffeescriptCompiler() if not config.coffeescript_compiler: - logging.error("No coffeescript compiler definied, skipping compiling %s" % merged_path) + logging.error("No coffeescript compiler defined, skipping compiling %s" % merged_path) return False # No coffeescript compiler, skip this file # Replace / with os separators and escape it diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py index e8eff61c..4c84298c 100644 --- a/src/File/FileRequest.py +++ b/src/File/FileRequest.py @@ -322,7 +322,7 @@ class FileRequest(object): if self.server.tor_manager and self.server.tor_manager.site_onions.get(site.address): # Running onion my_ip = helper.packOnionAddress(self.server.tor_manager.site_onions[site.address], self.server.port) my_back = back_onion - elif config.ip_external: # External ip definied + elif config.ip_external: # External ip defined my_ip = helper.packAddress(config.ip_external, self.server.port) my_back = back_ip4 else: # No external ip defined diff --git a/src/File/FileServer.py b/src/File/FileServer.py index bee39ded..74add97b 100644 --- a/src/File/FileServer.py +++ b/src/File/FileServer.py @@ -18,7 +18,7 @@ class FileServer(ConnectionServer): def __init__(self, ip=config.fileserver_ip, port=config.fileserver_port): ConnectionServer.__init__(self, ip, port, self.handleRequest) - if config.ip_external: # Ip external definied in arguments + if config.ip_external: # Ip external defined in arguments self.port_opened = True SiteManager.peer_blacklist.append((config.ip_external, self.port)) # Add myself to peer blacklist else: diff --git a/src/Test/TestContentUser.py b/src/Test/TestContentUser.py index 186192b3..dd4ea91b 100644 --- a/src/Test/TestContentUser.py +++ b/src/Test/TestContentUser.py @@ -18,7 +18,7 @@ class TestUserContent: # File info for exsitsing user file valid_signers = site.content_manager.getValidSigners("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json") assert '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT' in valid_signers # The site address - assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user definied in data/users/content.json + assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user defined in data/users/content.json assert '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C' in valid_signers # The user itself assert len(valid_signers) == 3 # No more valid signers @@ -28,7 +28,7 @@ class TestUserContent: valid_signers = site.content_manager.getValidSigners("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content) assert '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT' in valid_signers # The site address - assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user definied in data/users/content.json + assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user defined in data/users/content.json assert not '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C' in valid_signers # The user itself diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee index 6a5105a1..0e487c2d 100644 --- a/src/Ui/media/Wrapper.coffee +++ b/src/Ui/media/Wrapper.coffee @@ -50,7 +50,7 @@ class Wrapper else if cmd == "notification" # Display notification type = message.params[0] id = "notification-#{message.id}" - if "-" in message.params[0] # - in first param: message id definied + if "-" in message.params[0] # - in first param: message id defined [id, type] = message.params[0].split("-") @notifications.add(id, type, message.params[1], message.params[2]) else if cmd == "prompt" # Prompt input diff --git a/src/Worker/WorkerManager.py b/src/Worker/WorkerManager.py index 50c7f710..3289625f 100644 --- a/src/Worker/WorkerManager.py +++ b/src/Worker/WorkerManager.py @@ -152,16 +152,16 @@ class WorkerManager: if not self.tasks: return False # No task for workers if len(self.workers) >= self.getMaxWorkers() and not peers: - return False # Workers number already maxed and no starting peers definied + return False # Workers number already maxed and no starting peers defined if not peers: - peers = self.site.peers.values() # No peers definied, use any from site + peers = self.site.peers.values() # No peers defined, use any from site if type(peers) is set: peers = list(peers) random.shuffle(peers) for peer in peers: # One worker for every peer if peers and peer not in peers: - continue # If peers definied and peer not valid + continue # If peers defined and peer not valid worker = self.addWorker(peer) if worker: self.log.debug("Added worker: %s, workers: %s/%s" % (peer.key, len(self.workers), self.getMaxWorkers())) diff --git a/src/main.py b/src/main.py index 63ad500c..5f0f012c 100644 --- a/src/main.py +++ b/src/main.py @@ -169,7 +169,7 @@ class Actions(object): logging.info("Signing site: %s..." % address) site = Site(address, allow_create=False) - if not privatekey: # If no privatekey definied + if not privatekey: # If no privatekey defined from User import UserManager user = UserManager.user_manager.get() if user: