From 37906fdd25b532c23c77928a6fb89a6127900736 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sat, 11 Aug 2018 14:05:16 -0400
Subject: [PATCH] Remove submodule; all of pvc client is in one file

---
 debian/pvc-client.install |  1 -
 pvc.py                    | 24 +++++++++++-
 pvc/__init__.py           |  0
 pvc/ansiiprint.py         | 80 ---------------------------------------
 4 files changed, 22 insertions(+), 83 deletions(-)
 delete mode 100644 pvc/__init__.py
 delete mode 100644 pvc/ansiiprint.py

diff --git a/debian/pvc-client.install b/debian/pvc-client.install
index de9470d1..bd08bf03 100644
--- a/debian/pvc-client.install
+++ b/debian/pvc-client.install
@@ -1,2 +1 @@
 pvc.py usr/share/pvc
-pvc usr/share/pvc
diff --git a/pvc.py b/pvc.py
index a4453b8e..f9e1a651 100755
--- a/pvc.py
+++ b/pvc.py
@@ -34,12 +34,32 @@ import lxml.objectify
 import configparser
 import kazoo.client
 
-import pvc.ansiiprint as ansiiprint
-
 ###############################################################################
 # Supplemental functions
 ###############################################################################
 
+#
+# ansiiprint output
+#
+
+class ansiiprint:
+    # ANSII colours for output
+    def red():
+        return '\033[91m'
+    def blue():
+        return '\033[94m'
+    def green():
+        return '\033[92m'
+    def yellow():
+        return '\033[93m'
+    def purple():
+        return '\033[95m'
+    def bold():
+        return '\033[1m'
+    def end():
+        return '\033[0m'
+
+
 #
 # Validate a UUID
 #
diff --git a/pvc/__init__.py b/pvc/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pvc/ansiiprint.py b/pvc/ansiiprint.py
deleted file mode 100644
index 69cc1b0e..00000000
--- a/pvc/ansiiprint.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-
-# ansiprint.py - Printing function for formatted messages
-# Part of the Parallel Virtual Cluster (PVC) system
-#
-#    Copyright (C) 2018  Joshua M. Boniface <joshua@boniface.me>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-###############################################################################
-
-import datetime
-
-# ANSII colours for output
-def red():
-    return '\033[91m'
-def blue():
-    return '\033[94m'
-def green():
-    return '\033[92m'
-def yellow():
-    return '\033[93m'
-def purple():
-    return '\033[95m'
-def bold():
-    return '\033[1m'
-def end():
-    return '\033[0m'
-
-# Print function
-def echo(message, prefix, state):
-    # Get the date
-    date = '{} - '.format(datetime.datetime.now().strftime('%Y/%m/%d %H:%M:%S.%f'))
-    endc = end()
-
-    # Continuation
-    if state == 'c':
-        date = ''
-        colour = ''
-        prompt = '    '
-    # OK
-    elif state == 'o':
-        colour = green()
-        prompt = '>>> '
-    # Error
-    elif state == 'e':
-        colour = red()
-        prompt = '>>> '
-    # Warning
-    elif state == 'w':
-        colour = yellow()
-        prompt = '>>> '
-    # Tick
-    elif state == 't':
-        colour = purple()
-        prompt = '>>> '
-    # Information
-    elif state == 'i':
-        colour = blue()
-        prompt = '>>> '
-    else:
-        colour = bold()
-        prompt = '>>> '
-
-    # Append space to prefix
-    if prefix != '':
-        prefix = prefix + ' '
-
-    print(colour + prompt + endc + date + prefix + message)