Move use of settings default into the function instead of function definition.

[htsworkflow.git] / htsworkflow / frontend / bcmagic / utils.py

diff --git a/htsworkflow/frontend/bcmagic/utils.py b/htsworkflow/frontend/bcmagic/utils.py
index 78919b00f99a8a834b90884b219fc2145f2e9f68..ace241f4a748cbebe3aab4f98b56459f9fae8224 100644 (file)
--- a/htsworkflow/frontend/bcmagic/utils.py
+++ b/htsworkflow/frontend/bcmagic/utils.py
@@ -5,28 +5,35 @@ import socket
 import StringIO
 
 
-def print_zpl(zpl_text, host=settings.BCPRINTER_PRINTER1_HOST):
+def print_zpl(zpl_text, host=None):
     """
     Sends zpl_text to printer
     """
+    if not host:
+        host = settings.BCPRINTER_PRINTER1_HOST
     ftp = ftplib.FTP(host=host, user='blank', passwd='')
     ftp.login()
     ftp.storlines("STOR printme.txt", StringIO.StringIO(zpl_text))
     ftp.quit()
-    
 
-def print_zpl_socket(zpl_text, host=settings.BCPRINTER_PRINTER1_HOST, port=settings.BCPRINTER_PRINTER1_PORT):
+
+def print_zpl_socket(zpl_text, host=None, port=None):
     """
     Sends zpl_text to printer via a socket
-    
+
     if zpl_text is a list of zpl_texts, it will print each one
     in that list.
     """
     
+    if not host:
+        host=settings.BCPRINTER_PRINTER1_HOST
+    if not port:
+        port=settings.BCPRINTER_PRINTER1_PORT
+
     # Process anyway if zpl_text is a list.
     if type(zpl_text) is list:
         zpl_text = '\n'.join(zpl_text)
-    
+
     s = socket.socket()
     # PORT 9100 is default for Zebra tabletop/desktop printers
     # PORT 6101 is default for Zebra mobile printers
@@ -34,19 +41,20 @@ def print_zpl_socket(zpl_text, host=settings.BCPRINTER_PRINTER1_HOST, port=setti
     s.sendall(zpl_text)
     s.close()
 
+
 def report_error(message):
     """
     Return a dictionary with a command to display 'message'
     """
     return {'mode': 'Error', 'status': message}
-    
+
 
 def redirect_to_url(url):
     """
     Return a bcm dictionary with a command to redirect to 'url'
     """
     return {'mode': 'redirect', 'url': url}
-    
+
 
 def autofill(field, value):
     """