Change to using file instead of filename

This is more consistent with how the rest of Python handles specifying
files. You can specify an absolute or relative path.

Author: lgvacanti

cqc/pythonLib.py

@@ -2495,7 +2495,7 @@ def getTime(self, block=True):
 class CQCToFile(CQCHandler):
     """Handler to be used when writing the CQC commands to a file."""
 
-    def __init__(self, filename='CQC_File', pend_messages=False,
+    def __init__(self, file='CQC_File', pend_messages=False,
                  overwrite=False, binary=True):
 
         # Call init of CQCHandler
@@ -2507,28 +2507,26 @@ def __init__(self, filename='CQC_File', pend_messages=False,
 
         self.binary = binary
 
-        # Set path of file to write to
-        script_dir = sys.path[0]
-        self.filename = os.path.join(script_dir, filename)
+        self.file = file
 
         # Check if file exists
         if overwrite:
             # Remove file if we can overwrite
             try:
-                os.remove(self.filename)
+                os.remove(self.file)
             except FileNotFoundError:
                 pass
         else:
-            if not os.path.isfile(self.filename):
+            if not os.path.isfile(self.file):
                 pass
             else:
                 # Append number to filename if can't overwrite
                 num = 0
                 while True:
-                    if os.path.isfile(self.filename + str(num)):
+                    if os.path.isfile(self.file + str(num)):
                         num += 1
                     else:
-                        self.filename = self.filename + str(num)
+                        self.file = self.file + str(num)
                         break 
 
         # Don't want notify when writing to file
@@ -2542,10 +2540,10 @@ def commit(self, msg):
         """
 
         if self.binary is True:
-            with open(self.filename, 'ab') as f:
+            with open(self.file, 'ab') as f:
                 f.write(msg)
         else:
-            with open(self.filename, 'a') as f:      
+            with open(self.file, 'a') as f:      
                 f.write(str(msg) + '\n')
 
     def new_qubitID(self):

tests/test_CQCToFile.py

@@ -4,7 +4,7 @@
 #
 # filename = os.path.join(str(tmpdir), 'CQC_File')
 #
-# with CQCToFile(filename=filename) as cqc:
+# with CQCToFile(file=filename) as cqc:
 
 from cqc.pythonLib import CQCToFile, qubit
 import os
@@ -15,15 +15,15 @@ def test_name(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename) as cqc:
+    with CQCToFile(file=filename) as cqc:
         assert cqc.name == 'CQCToFile'
 
 
 def test_sendSimple(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename, binary=False) as cqc:
+    with CQCToFile(file=filename, binary=False) as cqc:
         cqc.sendSimple(CQC_TP_HELLO)
 
         with open(filename) as f:
@@ -36,7 +36,7 @@ def test_createqubit(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename, binary=False) as cqc:
+    with CQCToFile(file=filename, binary=False) as cqc:
 
         q = qubit(cqc)
         q.H()
@@ -54,7 +54,7 @@ def test_releasequbit(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename, binary=False) as cqc:
+    with CQCToFile(file=filename, binary=False) as cqc:
 
         q = qubit(cqc)
         q.H()
@@ -74,7 +74,7 @@ def test_Hgate(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename, binary=False) as cqc:
+    with CQCToFile(file=filename, binary=False) as cqc:
 
         q = qubit(cqc)
         q.H()
@@ -93,7 +93,7 @@ def test_some_combinations(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename) as cqc:
+    with CQCToFile(file=filename) as cqc:
 
         q = cqc.createEPR("Alice")
         q.H()
@@ -112,7 +112,7 @@ def test_flushing(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename, pend_messages=True) as cqc:
+    with CQCToFile(file=filename, pend_messages=True) as cqc:
 
         assert not cqc._pending_headers
 
@@ -132,7 +132,7 @@ def test_qubitIDs(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename) as cqc:
+    with CQCToFile(file=filename) as cqc:
 
         a = qubit(cqc)
         a.X()
@@ -150,7 +150,7 @@ def test_measurement(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename) as cqc:
+    with CQCToFile(file=filename) as cqc:
 
         q = qubit(cqc)
         a = q.measure()
@@ -161,7 +161,7 @@ def test_flush_on_exit(tmpdir):
 
     filename = os.path.join(str(tmpdir), 'CQC_File')
 
-    with CQCToFile(filename=filename, pend_messages=True, binary=False) as cqc:
+    with CQCToFile(file=filename, pend_messages=True, binary=False) as cqc:
 
         q = qubit(cqc)
         q.H()