Merge branch 'chaz' of git://github.com/ChazDazzle/fpdb-chaz

pyfpdb/Anonymise.py

@@ -39,17 +39,17 @@ obj = getattr(mod, filter_name, None)
 
 hhc = obj(config, autostart=False)
 
-if os.path.exists(options.infile):
-    in_fh = codecs.open(options.infile, 'r', "utf8")
+if os.path.exists(options.filename):
+    in_fh = codecs.open(options.filename, 'r', "utf8")
     filecontents = in_fh.read()
     in_fh.close()
 else:
-    print _("Could not find file %s") % options.infile
+    print _("Could not find file %s") % options.filename
     exit(1)
 
 m = hhc.re_PlayerInfo.finditer(filecontents)
 
-outfile = options.infile+".anon"
+outfile = options.filename+".anon"
 print _("Output being written to"), outfile
 
 savestdout = sys.stdout

pyfpdb/ImapFetcher.py

@@ -131,7 +131,7 @@ def readFile(filename, options):
     return whole_file
 
 def runFake(db, config, options):
-    summaryText = readFile(options.infile, options)
+    summaryText = readFile(options.filename, options)
     importSummaries(db, config,[summaryText], options=options)
 
 def importSummaries(db, config, summaries, options = None):

pyfpdb/Options.py

@@ -38,9 +38,6 @@ def fpdb_options():
     parser.add_option("-r", "--rerunPython",
                       action="store_true",
                       help=_("Indicates program was restarted with a different path (only allowed once)."))
-    parser.add_option("-i", "--infile",
-                      dest="infile", default="Slartibartfast",
-                      help=_("Input file"))
     parser.add_option("-k", "--konverter",
                       dest="hhc", default="PokerStarsToFpdb",
                       help=_("Module name for Hand History Converter"))