64f127cb71252486ce096a832ac7fad3deb324a5
mmaddren
  Wed Sep 14 17:04:53 2011 -0700
large-scale renaming change to allow python to be built into cluster/bin, also mkGeoPkg now renames files
diff --git python/programs/cvValidate/cvValidate python/programs/cvValidate/cvValidate
index 8bee272..3ed6509 100755
--- python/programs/cvValidate/cvValidate
+++ python/programs/cvValidate/cvValidate
@@ -1,31 +1,31 @@
 #!/hive/groups/encode/dcc/bin/python
 import sys
 import argparse
-from ucscgenomics.cvfile.CvFile import *
+from ucscgenomics import cv
 
 class validate(object):
 	"""validation script that calls cv.validate and then puts all its errors into a list"""
 
 	def __init__(self):
 	
 		parser = argparse.ArgumentParser(description = 'Validates the controlled vocabulary file')
 		parser.add_argument('-t', '--trackPath', help='Overrides the default track path ~/kent/src/hg/makeDb/trackDb/')
 		parser.add_argument('-p', '--protocolPath', help='Overrides the default protocol path ~/htdocsExtras/ENCODE/')
 		parser.add_argument('-n', '--nowarn', action='store_true', default=False, help='Suppress all warnings, only display breaking errors')
 		
 		args = parser.parse_args(sys.argv[1:])
 	
 		self.errors = list()
-		self.cv = CvFile(args.trackPath, self.addtoerrs, args.protocolPath)	
+		self.cv = cv.CvFile(args.trackPath, self.addtoerrs, args.protocolPath)	
 		self.cv.validate()
 		
 		for err in self.errors:
 			print err
 			
 	def addtoerrs(self, exception):
 		self.errors.append(exception)
 
 if __name__ == '__main__':
     val = validate()