From: Razvan Deaconescu Date: Sat, 20 Aug 2011 18:00:46 +0000 (+0300) Subject: ppf: Replace TABs with spaces. X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=017e8aa8d028848bab1a885ed4d36538cac864f9;p=cs-p2p-next.git ppf: Replace TABs with spaces. --- diff --git a/ppf/db/msgctl.py b/ppf/db/msgctl.py index dcbd165..0162c31 100644 --- a/ppf/db/msgctl.py +++ b/ppf/db/msgctl.py @@ -89,8 +89,8 @@ def read_status_messages(dba, sep = ','): eta.insert(0, 0) dba.add_status_message_date_time(cs_id, date, time, - num_peers, dht, download_speed, - upload_speed, download_size, upload_size, eta) + num_peers, dht, download_speed, + upload_speed, download_size, upload_size, eta) else: break @@ -113,8 +113,8 @@ def read_verbose_messages(dba, sep = ','): listen_port = int(message_array[8].strip()) dba.add_verbose_message_date_time(cs_id, date, time, - peer_ip, peer_port, message_type, - index, begin, length, listen_port) + peer_ip, peer_port, message_type, + index, begin, length, listen_port) else: break @@ -262,8 +262,8 @@ def main(): listen_port = int(sys.stdin.readline().strip()) dba.add_verbose_messages_date_time(cs_id, date, time, - peer_ip, peer_port, message_type, index, - begin, length, listen_port) + peer_ip, peer_port, message_type, index, + begin, length, listen_port) if action == "delete": dba.delete_verbose_messages(id) diff --git a/ppf/db/sessctl.py b/ppf/db/sessctl.py index 35d6746..211dce4 100644 --- a/ppf/db/sessctl.py +++ b/ppf/db/sessctl.py @@ -109,15 +109,15 @@ def read_client_sessions(dba, sep = ','): time = timestamp[1] logger.debug("(%d, %s, %s, %s, %d, %d, %s, %d, %d, %d, %s, %s)" - %(swarm_id, client_name, system_os, - system_os_version, system_ram, - system_cpu, public_ip, public_port, - ds_limit, us_limit, date, time)) + %(swarm_id, client_name, system_os, + system_os_version, system_ram, + system_cpu, public_ip, public_port, + ds_limit, us_limit, date, time)) dba.add_client_session_date_time(swarm_id, client_name, - system_os, system_os_version, system_ram, - system_cpu, public_ip, public_port, - ds_limit, us_limit, date, time) + system_os, system_os_version, system_ram, + system_cpu, public_ip, public_port, + ds_limit, us_limit, date, time) else: break @@ -134,8 +134,8 @@ def main(): try: opts, args = getopt.getopt(sys.argv[1:], "ha:l:d:r:m:s:c:i:", - ["help", "add=", "list=", "delete=", "read=", - "sep=", "swarm=", "client=", "id="]) + ["help", "add=", "list=", "delete=", "read=", + "sep=", "swarm=", "client=", "id="]) except getopt.GetoptError, err: logger.error(str(err)) usage() @@ -275,8 +275,8 @@ def main(): start_time = sys.stdin.readline().strip().split(' ') dba.add_client_sessions_date_time(swarm_id, client_name, - system_os, os_version, ram, cpu, ip, port, - ds_limit, us_limit, date, time) + system_os, os_version, ram, cpu, ip, port, + ds_limit, us_limit, date, time) if action == "delete": if client_session_list_option == "id": dba.delete_client_session_by_id(id) @@ -289,7 +289,7 @@ def main(): dba.show_client_sessions_by_swarm(swarm, client) if action == "read": read_client_sessions(dba, sep) - + dba.disconnect() if __name__ == "__main__": diff --git a/ppf/db/sqlite_initdb.py b/ppf/db/sqlite_initdb.py index 8de584c..24fe455 100644 --- a/ppf/db/sqlite_initdb.py +++ b/ppf/db/sqlite_initdb.py @@ -93,7 +93,7 @@ def main(): logger.debug("Using database file %s." %(database)) if sql == None: - sql = DEFAULT_SQL_SCRIPT + sql = DEFAULT_SQL_SCRIPT logger.debug("Using SQL script %s." %(sql)) init_database(sql, database)