Remove the old option syntax compatibility code.

diff --git a/NEWS b/NEWS
index 502535576ef754487d6f403c2b3069d52190f9b0..8c0435ecf4079ad09a8d5cb85f55856ce53f1c92 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 - rawdog 2.0
 
-Update to feedparser 3.3. FIXME detail what I've done to it
+Update to feedparser 3.3. This meant reworking some of rawdog's
+internals; state files from old versions will no longer work with rawdog
+2.0 (and external programs that manipulate rawdog state files will also
+be broken).
+
+The old option syntax ("rawdog update write") is no longer supported.
 
 - rawdog 1.13
 

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 45fc71598a0313d50fe09407c09afd935937a3c3..9971ba85e65bffc9a2dc43ab76126f1d7c62108f 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -854,6 +854,10 @@ def main(argv):
                usage()
                return 1
 
+       if len(args) != 0:
+               usage()
+               return 1
+
        statedir = os.environ["HOME"] + "/.rawdog"
        for o, a in optlist:
                if o == "--help":
@@ -862,13 +866,6 @@ def main(argv):
                elif o in ("-d", "--dir"):
                        statedir = a
 
-       # Support old option syntax.
-       for action in args:
-               if action in ("list", "update", "write"):
-                       optlist.append(("--" + action, None))
-               else:
-                       optlist.append(("--update-feed", action))
-
        try:
                os.chdir(statedir)
        except OSError:

diff --git a/todolist b/todolist
index 89482786f8d24ff0fc3e904788ac2c48f2fce54d..87ab3766dce2fe4bd83545b6df8fdbbb65bc53a3 100644 (file)
--- a/todolist
+++ b/todolist
@@ -44,7 +44,6 @@ latest version.
 
 For next release:
 - generalise templating (so the show template option takes a name, etc.)
-- remove old option parsing
 - require Python 2.3; kill 2.2 urllib2 workaround
 - use unicode.encode('ascii','xmlcharrefreplace') if possible?