From 513aa393b07bca1987dc668c0cb522cc8433df18 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 25 Oct 2014 11:33:08 +0800
Subject: [PATCH] pc_rpc: avoid 'close' name conflict in client

---
 artiq/management/pc_rpc.py | 2 +-
 frontend/artiq             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/artiq/management/pc_rpc.py b/artiq/management/pc_rpc.py
index 43681622a..a00c7cbcb 100644
--- a/artiq/management/pc_rpc.py
+++ b/artiq/management/pc_rpc.py
@@ -12,7 +12,7 @@ class Client:
     def __init__(self, host, port):
         self.socket = socket.create_connection((host, port))
 
-    def close(self):
+    def close_rpc(self):
         self.socket.close()
 
     def do_rpc(self, name, args, kwargs):
diff --git a/frontend/artiq b/frontend/artiq
index 2ad149a19..b6a3989af 100755
--- a/frontend/artiq
+++ b/frontend/artiq
@@ -37,7 +37,7 @@ def main():
         if args.quit_master:
             remote.quit()
     finally:
-        remote.close()
+        remote.close_rpc()
 
 if __name__ == "__main__":
     main()