From 80242ffb7cad4f7ee33a7f7d8dab357c669125fd Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Thu, 8 Dec 2016 11:49:33 +0100
Subject: [PATCH] Re-writing uptime for python3 with more general
 outputhandling

---
 __pycache__/ipLookup.cpython-34.pyc | Bin 0 -> 1737 bytes
 __pycache__/uptime.cpython-34.pyc   | Bin 0 -> 1588 bytes
 testUptime.py                       |  12 ++++++++++
 uptime.py                           |  34 ++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 __pycache__/ipLookup.cpython-34.pyc
 create mode 100644 __pycache__/uptime.cpython-34.pyc
 create mode 100755 testUptime.py
 create mode 100644 uptime.py

diff --git a/__pycache__/ipLookup.cpython-34.pyc b/__pycache__/ipLookup.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d1b7db8197cbda8fbf70228ccd2218f7c1c3a5e3
GIT binary patch
literal 1737
zcmZ`(QIFe15T3Oi$I1CFZSNojRVWe?k|lJJc%-O8;-E-9^1unHG7l@qyUE!kUbE{Q
zy{LWR5d0P%_(AL|PrUF0cw%M~yVnCO?__p7J3IO2oB1m~9De)z<LAEx0Dr)(2lwzP
zF7pJ1z?Z=aAZ4xYLF%=-52+7N1@3+L30-}V0o<UqN5?Lb;7^PJvz%o6_<O}XM@6=g
zDJG+6zW^-oE*J7={2GA3w@2YAY6zn5bW|b`1E=>v3_%<?J)#H~No=E{K3D3yO}%|v
zsN6KVsFst3(v#Mnd;3i2m$IT|o}p;)W$+T<#)Hy>8vusM;hy`@1W@+iC4-xtB_w+p
zLfLl?PL|Q`3?<^tw(mZb>bz*=S=MCp%t$lMi{|=ty%zIiV0&g$ORXsh8*yG#MZ>wh
zC-%<gD$kliRd!I+nGjkUlMaiT?{(Ynlq;zXIUX!!)1FE^8yLA-=st!|m>qDQuQFpe
z{}ujzJpIPtndvimRa9RUVy@)$OsjgXUQFxj=2BHt(`3!Ye3?~ZCH1sL?zFzvM3X~Y
zW{3jVF&nT4Y{a(rJE!))<cvJ<A$;j?eum4GC=ln85yAwaPl&!kP|*@NOV3&GD^{Tc
z81cp}7GZ}sdg3;Ma?o0a&T;@{><V&7T)jxxEIG2_QmUf<$VM%=HvC#<0@3ebHfca*
zaY&{8Ty3gGU)!L{)-sLFW-f}Wg77uz;aZu7n_A|@qR7)w%O%>=utsyXvO%tdOe5Nn
zmiU?=vgk%vr4g2}#xPRHXx<3|QV&p^;4)+f_LjqQgmQb*VS1~y9eoK_S`OATREVn#
z#@IvSSKcj<k;x47hlJ0L%hd_d8M_uOV-dg@zyIhO{UYhjw)g+V+ilOWcH8@+SjowD
zG!aUgNu`>Jd{LMt=~+)18`N2IX~V)S(91z<2Q!56bFG!$!=Xo*XnI`9AKI>HDSHPN
zdz4>h)v{}zM|jReD1aRyHnF!Icj&z7+3}9}N6P_3jX-qUlY+VY66R`j_v&MW`)+#g
z<9XvI2irdCZvGF)H?HsM^Bx{Y+EWH@gkY`4`@JjA*i8)Y<4NLMABUDczymZFM3LiM
z_@6}koTD%2AKXgrUYFedBhDI(Lwv^hGUR-%#AZc$%=!15Y_<P_v2b2;?mFC&Qa{A7
z`W+I4{%e#l8%j?*`VuCzbM%c_$R70LDDKC;8*NFLj&|L5+BTm)qO&0hqP-2(yp(z4
Z++W|Z)93~peX>jW36<Z_0E*c|?;jsahr$2=

literal 0
HcmV?d00001

diff --git a/__pycache__/uptime.cpython-34.pyc b/__pycache__/uptime.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..53deb4ece2faf46824dfdc7cb2b5f0ea29dccb9a
GIT binary patch
literal 1588
zcmZWpU60#D6usk*B%7pNwzTXPAru~6m5qe@02M+=fB-?Gm7=1`T5069C&f`>yEFDe
zqur-P@WLPAFU=!7?F&DkPn<h;vamSz`1;Pwz2}~LCV!9b44<u^y!g{6`iuT`1+YKI
zV?M%=;TE(aig&i4SkTv*N10E*!0VIp=*p+q=cV%~xW+!3r95sg<ZzdHftNxw!I5Lc
zKs29zBU-@YLjDSWKpF0k!^a_IJ<9sdhB2UQ&)I#-hLnw*J>UrQXl#2;Rp)E9xu2D(
zsdZkwoGeN`X}ziFP=t5~co>!W9Yc*<&;`+zM@tk#Bx;|Qz~E4^9nzH$mslid+2a+b
z9$n)0=>mHI#>WC$0$#wzWx(N<dvxInc?g$a$Iv-?v~!G{qu)Bf$vhg&v<FPKXX>nM
z>P^_xiw{5Ec#kKV3%KUVYle<`L(^1Bx9bN|=0#phX@{mct8|$vV{CX*R;sYU$+st8
z#iO)bubU!IlUmtcrqVJ~h*7Qb+77ZtCv{#HHf)U2#s;f0$)eB(My(ds*U3+|2Rv0%
z+YmWR9S>Vxzt2q_3A-m{x=M_Z@(+6R$@Dn~nSQ6v^Ws^aot0|(r7o+p^5<#wy8f{&
zrlwBn#(a|$*-GhY8|t`vt@|i#jK|!?K;mt2B<_hL??4=g&3?CRTWZQ=@WpR#=@)p+
zdl=BtC7S2@hn_*7pkG2^OtC-PgvXDXYGNt!t*4dsL7BdTeUYc%!pn}^Qs+)Y`T<<+
z@D5wNkPYL~-@w{Z_#arj#=+uUfWkQ3VVXx`775K|c3Jhiux}^h`G<J6$;KTAu1mX2
zEQlQe&++kp0wCAUiIeKFZg;G(G$CX7oqA7Oww#7#=n&)RF>~Q;b8!5Kl`%=ql}=tN
z^K_yQk#FOj7H`BP>gywXX-2H~dEj2gBi<s{dC}A=-gh61{9JX8gU+$2RnfX4-?hOJ
z5)XO$hh)_#bDJE_!0k3Y3?v>vESphB5bxTZc|JPKk?X|!FhB)Y4QV);9CqIzMbP0q
z@@5<F=>+QV@js&PV}r#3%kmTl3{7K=+`?k}Qev%?A7F0Vth+nGx~XW7qZG+n@iCQh
zU1rUS?Xi@vnq<|@AQJw-q;zM&sm-aR<&(kRqy`oSr=2cYYD3P>oR39M+#8O4{6hB+
k5e0g{OSwNd%4bWJ)^6e^T5EAEJNUE(_ZjbT<s5nc0L|G*Q~&?~

literal 0
HcmV?d00001

diff --git a/testUptime.py b/testUptime.py
new file mode 100755
index 0000000..b307fa9
--- /dev/null
+++ b/testUptime.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author: KevinMidboe
+# @Date:   2016-11-22 16:08:17
+# @Last Modified by:   KevinMidboe
+# @Last Modified time: 2016-11-22 17:07:52
+
+import uptime
+
+if __name__ == '__main__':
+	uptimeClass = uptime.uptime()
+	print(uptimeClass)
\ No newline at end of file
diff --git a/uptime.py b/uptime.py
new file mode 100644
index 0000000..3c4c0c5
--- /dev/null
+++ b/uptime.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author: KevinMidboe
+# @Date:   2016-11-22 16:05:18
+# @Last Modified by:   KevinMidboe
+# @Last Modified time: 2016-11-22 17:07:41
+
+import subprocess, re
+
+class uptime(object):
+	"""docstring for uptime"""
+	def __init__(self):
+		super(uptime, self).__init__()
+		raw = subprocess.Popen('uptime', stdout=subprocess.PIPE)
+		output, error = raw.communicate()
+		uptimeList = output.decode('utf-8').split(', ')
+		
+		self.duration(uptimeList[0])
+		self.users(uptimeList[2])
+		self.load(uptimeList[3])
+
+	def duration(self, outputString):
+		self.duration = re.sub(r'.*up ', '', outputString)
+
+	def users(self, outputString):
+		self.users = outputString
+
+	def load(self, outputString):
+		loadValues = re.sub(r'.*load averages: ', '', outputString)
+		self.load = re.sub(r'\n', '', loadValues)
+		self.load_minute, self.load_fiveminute, self.load_fiftenminute = self.load.split(' ')
+
+	def __str__(self):
+		return str(self.__class__) + ": " + str(self.__dict__)
\ No newline at end of file