From 6a1be5cf06a387aff38e100b479fbf0ddd32f217 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 28 Oct 2019 17:46:17 -0600
Subject: [PATCH] Moved wk.obj to wk.hw.obj

* Done because the main classes are CpuRam() and Disk()
  * The rest are there for uniformity while working with HW objects
---
 scripts/wk/__init__.py     | 1 -
 scripts/wk/hw/__init__.py  | 2 ++
 scripts/wk/{ => hw}/obj.py | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename scripts/wk/{ => hw}/obj.py (99%)

diff --git a/scripts/wk/__init__.py b/scripts/wk/__init__.py
index 589cc28b..511cf8a7 100644
--- a/scripts/wk/__init__.py
+++ b/scripts/wk/__init__.py
@@ -10,7 +10,6 @@ from wk import io
 from wk import kit
 from wk import log
 from wk import net
-from wk import obj
 from wk import os
 from wk import std
 from wk import sw
diff --git a/scripts/wk/hw/__init__.py b/scripts/wk/hw/__init__.py
index 2b0fbc10..dbc9ea7e 100644
--- a/scripts/wk/hw/__init__.py
+++ b/scripts/wk/hw/__init__.py
@@ -1 +1,3 @@
 """WizardKit: hw module init"""
+
+from wk.hw import obj
diff --git a/scripts/wk/obj.py b/scripts/wk/hw/obj.py
similarity index 99%
rename from scripts/wk/obj.py
rename to scripts/wk/hw/obj.py
index 9305f6ad..ac52c869 100644
--- a/scripts/wk/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -1,4 +1,4 @@
-"""WizardKit: Objects."""
+"""WizardKit: Hardware objects (mostly)."""
 # vim: sts=2 sw=2 ts=2
 
 import logging
@@ -298,6 +298,7 @@ def get_disk_serial_macos(path):
   """Get disk serial using system_profiler, returns str."""
   serial = 'Unknown Serial'
   # TODO: Make it real
+  str(path)
   return serial
 
 
@@ -329,6 +330,7 @@ def get_ram_list_linux():
   # Save details
   return dimm_list
 
+
 def get_ram_list_macos():
   """Get RAM list using system_profiler."""
   dimm_list = []