@@ -43,6 +43,9 @@ def create_logdir(): os.makedirs(LOGDIR) def logdir(filename): + path = os.path.dirname(filename) + if path: + return filename return os.path.join(LOGDIR, os.path.basename(filename)) def savelog(s, filename, mode=None): @@ -57,15 +60,13 @@ def serialize(o, filename): except AttributeError: pass #fp = gzip.GzipFile(logdir(filename), 'w', compresslevel=1) - fp = open(logdir(filename), 'w') - pickle.dump(o, fp, pickle.HIGHEST_PROTOCOL) + pickle.dump(o, open(logdir(filename), 'w'), pickle.HIGHEST_PROTOCOL) def deserialize(filename): if not os.path.exists(filename): filename = logdir(filename) #fp = gzip.GzipFile(filename, 'r') - fp = open(filename, 'r') - o = pickle.load(fp) + o = pickle.load(open(filename, 'r')) try: getattr(o, "_from_pickle")() except AttributeError: @@ -73,7 +74,8 @@ def deserialize(filename): return o def opts_help(option, opt_str, value, parser): - write_err("Usage: %s %s\n\n" % (os.path.basename(sys.argv[0]), parser.usage)) + header = "spiderfetch tool suite\n" + write_err(header+"Usage: %s %s\n\n" % (os.path.basename(sys.argv[0]), parser.usage)) for o in parser.option_list: var = o.metavar or "" short = (o._short_opts and o._short_opts[0]) or "" io.py e44f12958c4c4e5b31b7c2a596767879e5f106ec Martin Matusiak numerodix@gmail.com http://github.com/numerodix/spiderfetch/commit/d8ec49d54707aff5119dc62a30413b513118d34c d8ec49d54707aff5119dc62a30413b513118d34c 2008-06-27T07:28:26-07:00 2008-06-27T07:28:26-07:00 fix io.py sanity check, apply logdir() only on paths == basename 0b0f47d4f68ba9540f6c060d140dfe504096f317 Martin Matusiak numerodix@gmail.com