# HG changeset patch
# User Ben Croston <ben@croston.org>
# Date 1314805422 -3600
# Node ID e4d0e4da5e4def4574b53d7bd898ccfd6dbfda5d
# Parent  0da94dcfdd552c84e405c477d9e8d57bdf463673# Parent  117c2aac83e5ea9f4bdae38dfe2c7ca0b9888591
Merge

diff -r 0da94dcfdd55 -r e4d0e4da5e4d zebra.py
--- a/zebra.py	Wed Aug 31 16:43:02 2011 +0100
+++ b/zebra.py	Wed Aug 31 16:43:42 2011 +0100
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-
-import subprocess
 import os.path
 import sys
 
@@ -9,6 +7,7 @@
     import win32print
 else:
     IS_WINDOWS = False
+    import subprocess
 
 class zebra(object):
     """A class to communicate with (Zebra) label printers using EPL2"""