Cleaned the merge a bit and added some comments

jekyc · Mar 30, 2016 · d1ce471 · d1ce471
1 parent 3e49dc0
commit d1ce471
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/classes/fingerprints.py b/classes/fingerprints.py
@@ -1,16 +1,17 @@
 import json
-import os
 import copy
-
+import os
 import os.path
 
-datadir = os.path.dirname(os.path.abspath(__file__))
-datadir = datadir.rsplit('/', maxsplit=1)[0]
-datadir += '/data'
 
 class Fingerprints(object):
 
-	def __init__(self):
+	def __init__(self, data_dir='data'):
+		# get the absolute location of this file
+		datadir = os.path.dirname(os.path.abspath(__file__))
+
+		# remove the 'classes' dir and add the 'data_dir'
+		datadir = os.path.join(datadir.rsplit('/', maxsplit=1)[0], data_dir)
 
 		self.data = {
 			'cms': {