From a66fb31027465d3b79196abc9ac95811c5f1f82f Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Fri, 17 Apr 2009 08:06:35 -0400
Subject: [PATCH] Clean up command line options display. Use opf2 instead of
 opf.

---
 src/calibre/ebooks/pdf/input.py  | 2 +-
 src/calibre/ebooks/txt/input.py  | 2 +-
 src/calibre/ebooks/txt/output.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/pdf/input.py b/src/calibre/ebooks/pdf/input.py
index 6733d3aadc..e8c3889e41 100644
--- a/src/calibre/ebooks/pdf/input.py
+++ b/src/calibre/ebooks/pdf/input.py
@@ -9,7 +9,7 @@ import os
 
 from calibre.customize.conversion import InputFormatPlugin
 from calibre.ebooks.pdf.pdftohtml import pdftohtml
-from calibre.ebooks.metadata.opf import OPFCreator
+from calibre.ebooks.metadata.opf2 import OPFCreator
 
 class PDFInput(InputFormatPlugin):
     
diff --git a/src/calibre/ebooks/txt/input.py b/src/calibre/ebooks/txt/input.py
index aafc36989e..34fafc91fc 100644
--- a/src/calibre/ebooks/txt/input.py
+++ b/src/calibre/ebooks/txt/input.py
@@ -9,7 +9,7 @@ import os
 
 from calibre.customize.conversion import InputFormatPlugin
 from calibre.ebooks.markdown import markdown
-from calibre.ebooks.metadata.opf import OPFCreator
+from calibre.ebooks.metadata.opf2 import OPFCreator
 
 class TXTInput(InputFormatPlugin):
     
diff --git a/src/calibre/ebooks/txt/output.py b/src/calibre/ebooks/txt/output.py
index 423e668a56..dd87394507 100644
--- a/src/calibre/ebooks/txt/output.py
+++ b/src/calibre/ebooks/txt/output.py
@@ -18,14 +18,14 @@ class TXTOutput(OutputFormatPlugin):
 
     options = set([
                     OptionRecommendation(name='newline', recommended_value='system',
-                        level=OptionRecommendation.LOW, long_switch='newline',
+                        level=OptionRecommendation.LOW,
                         short_switch='n', choices=TxtNewlines.NEWLINE_TYPES.keys(),
                         help=_('Type of newline to use. Options are %s. Default is \'system\'. '
                             'Use \'old_mac\' for compatibility with Mac OS 9 and earlier. '
                             'For Mac OS X use \'unix\'. \'system\' will default to the newline '
                             'type used by this OS.' % sorted(TxtNewlines.NEWLINE_TYPES.keys()))),
                     OptionRecommendation(name='prepend_metadata', recommended_value='false',
-                        level=OptionRecommendation.LOW, long_switch='prepend_metadata',
+                        level=OptionRecommendation.LOW,
                         choices=['true', 'false'],
                         help=_('Write the title and author to the beginning of the file. '
                             'Default is \'true\'. Use \'false\' to disable.')),