Merged some new bugs and be-xml-to-mbox extra_strings fix

17 files changed, 59 insertions, 194 deletions

diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/comments/85770405-0ead-4044-a3cf-082615ff1b6f/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/comments/85770405-0ead-4044-a3cf-082615ff1b6f/body
new file mode 100644
index 0000000..c49c15c
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/comments/85770405-0ead-4044-a3cf-082615ff1b6f/body
@@ -0,0 +1,22 @@
+This is an outgrowth of #bea86499-824e-4e77-b085-2d581fa9ccab/1100c966-9671-4bc6-8b68-6d408a910da1/bd1207ef-f97e-4078-8c5d-046072012082#:
+> All of this makes me wonder how much we care about being able to
+> see bug diffs for any repository format older than the current one.
+> I think that we don't really care ;).  After all, the on-disk
+> format should settle down as BE matures :p.  When you _do_ want
+> to see the long-term history of a particular bug, there's always
+>   bzr log .be/123/bugs/456/values
+> or the equivalent for your VCS.  If access to the raw log ends
+> up being important, it should be very easy to add
+>   libbe.storage.base.VersionedStorage.log(id)
+>   libbe.command.log
+
+Access to the (parsed) logs will be important for pretty-printing
+bugdir/bug/comment change logs.  Since we do version the bug
+repository, users will expect us to be able to list the history for
+any particular item (e.g. for "last activity" timestamps, automatic
+reminder emails, whatever).  While it does not necessarily need to be
+able to delve into old storage formats, it does need to get
+implemented.  It's probably worth encapsulating changes in something
+like a list of Diff() objects, although it might be worth linking
+along bug lines, etc., like VCS annotation.
+
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/comments/85770405-0ead-4044-a3cf-082615ff1b6f/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/comments/85770405-0ead-4044-a3cf-082615ff1b6f/values
new file mode 100644
index 0000000..d29604d
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/comments/85770405-0ead-4044-a3cf-082615ff1b6f/values
@@ -0,0 +1,8 @@
+Author: W. Trevor King <wking@drexel.edu>
+
+
+Content-type: text/plain
+
+
+Date: Fri, 29 Jan 2010 01:12:54 +0000
+
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/values
new file mode 100644
index 0000000..6d46f8f
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/16989098-aa1d-4a08-bff9-80446b4a82c5/values
@@ -0,0 +1,17 @@
+creator: W. Trevor King <wking@drexel.edu>
+
+
+reporter: W. Trevor King <wking@drexel.edu>
+
+
+severity: wishlist
+
+
+status: open
+
+
+summary: Generating per-bugdir/bug/comment change logs
+
+
+time: Thu, 28 Jan 2010 23:10:48 +0000
+
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/c1b76442-eab6-4796-9517-8454425d7757/comments/76d54016-755b-42ca-ad07-eb9a1c77c33d/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/c1b76442-eab6-4796-9517-8454425d7757/comments/76d54016-755b-42ca-ad07-eb9a1c77c33d/body
new file mode 100644
index 0000000..f890566
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/c1b76442-eab6-4796-9517-8454425d7757/comments/76d54016-755b-42ca-ad07-eb9a1c77c33d/body
@@ -0,0 +1,2 @@
+Steve's had some related thoughts on authentication for CFBE:
+#bea86499-824e-4e77-b085-2d581fa9ccab/d9959864-ea91-475a-a075-f39aa6760f98/21c90231-d7f2-49bb-97d9-99e16459d799#.
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/c1b76442-eab6-4796-9517-8454425d7757/comments/76d54016-755b-42ca-ad07-eb9a1c77c33d/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/c1b76442-eab6-4796-9517-8454425d7757/comments/76d54016-755b-42ca-ad07-eb9a1c77c33d/values
new file mode 100644
index 0000000..1566702
--- /dev/null
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/c1b76442-eab6-4796-9517-8454425d7757/comments/76d54016-755b-42ca-ad07-eb9a1c77c33d/values
@@ -0,0 +1,8 @@
+Author: W. Trevor King <wking@drexel.edu>
+
+
+Content-type: text/plain
+
+
+Date: Thu, 28 Jan 2010 22:58:08 +0000
+
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/00c6f4d8-f965-4d2f-a652-17e58c20ab8c/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/00c6f4d8-f965-4d2f-a652-17e58c20ab8c/body
index 63b61ad..a6ce192 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/00c6f4d8-f965-4d2f-a652-17e58c20ab8c/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/00c6f4d8-f965-4d2f-a652-17e58c20ab8c/body
@@ -17,10 +17,3 @@ further.
 Thanks,
 
 - Chris.
--- 
-Chris Ball   <cjb@laptop.org>
-
-_______________________________________________
-Be-devel mailing list
-Be-devel@bugseverywhere.org
-http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/16357f68-19c0-4bf9-8220-b88b52b3456d/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/16357f68-19c0-4bf9-8220-b88b52b3456d/body
index 3a08d71..5a3508c 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/16357f68-19c0-4bf9-8220-b88b52b3456d/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/16357f68-19c0-4bf9-8220-b88b52b3456d/body
@@ -24,12 +24,3 @@ for that project.
 I know that's a lot of steps.  I'd like to streamline it quite a bit,  
 but first I wanted to see if you have any feedback on the system  
 itself. Thanks!
-
---
-Steve Losh
-http://stevelosh.com/
-
-_______________________________________________
-Be-devel mailing list
-Be-devel@bugseverywhere.org
-http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
deleted file mode 100644
index d2ef28c..0000000
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/body
+++ /dev/null
@@ -1,77 +0,0 @@
-Those are beautiful templates -- can you share those?  I'd love to
-study the HTML and CSS behind them.
-
-On Sat, Feb 7, 2009 at 5:48 PM, Steve Losh <steve@stevelosh.com> wrote:
-> Hey Chris, thanks for the comments.
->
->>
->> My initial impression is that this looks good enough already to merge as
->> a replacement for the turbogears site.  What does everyone else think?
->>
->
-> I'm not quite sure it's there yet.  There are a bunch of bugs I've got
-> marked as "beta" that I'd like to see fixed before it's ready for real use.
->  Hopefully they shouldn't be too tough to fix.  You can point CFBE at itself
-> to see them.  :)
->
->> Could you explain a little about how you handle authorship of bug
->> changes at the moment, and if it looks plausible to try making it
->> multiuser?  (Having it handle more than one "user" logged in at once.)
->>
->
-> That's something I need advice on.  Right now CFBE is pretty much only
-> suitable for local use - you check out whatever you're working on and use it
-> as a local interface to the bugs in the repository.  Change those, check in,
-> etc.  It's effectively just a pretty version of the command line be tool.
->
-> I haven't used CherryPy's session/authentication support before.  This might
-> be a good time for me to learn.  One way it might be able to handle multiple
-> users hitting a central server:
->
-> * Each user has to register with the server and be approved by an admin.
-> * Each account would be mapped to a contributor string, the same one that
-> would show up if you were going to commit to the repository.
-> * Once you have an account, you'd login to make any changes.
->
->
-> Aside from all that, I'm a little fuzzy on how a centralized interface to a
-> distributed bug tracking system should work.  A read-only interface to a
-> central "main" repository would be easy.  Run the server in read-only mode
-> pointing at the main repository.  People can use it to look at the bugs in
-> the tip of that repository.
->
-> If it's not read-only, what happens when a user changes/adds/whatevers a
-> bug?  Should CFBE commit that change to the repository right then and there?
->  Should it never commit, just update the bugdir and let the commits happen
-> manually?
->
-> What happens when you have multiple branches for a repository?  Should there
-> be one CFBE instance for each branch, or a single one that lets you switch
-> between branches (effectively switching between revisions)?
->
-> Those are the kind of things that don't really apply when CFBE is just a
-> local interface to a single repository.  If anyone has any advice on how a
-> multi-user interface should work I'd love to hear it!
->
-> --
-> Steve Losh
-> http://stevelosh.com/
->
->
-> _______________________________________________
-> Be-devel mailing list
-> Be-devel@bugseverywhere.org
-> http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
->
-
-
-
--- 
-Matthew Wilson
-matt@tplus1.com
-http://tplus1.com
-
-_______________________________________________
-Be-devel mailing list
-Be-devel@bugseverywhere.org
-http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values
deleted file mode 100644
index ca3efd0..0000000
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/1f25cba2-03ee-43e1-a042-ef6724938ad8/values
+++ /dev/null
@@ -1,14 +0,0 @@
-Alt-id: <f6f643a20902071531y6aa3d7a6k7c5a4bd4aa5a04f6@mail.gmail.com>
-
-
-Author: Matthew Wilson <matt@tplus1.com>
-
-
-Content-type: text/plain
-
-
-Date: Sat, 07 Feb 2009 18:31:04 -0500
-
-
-In-reply-to: 21c90231-d7f2-49bb-97d9-99e16459d799
-
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/21c90231-d7f2-49bb-97d9-99e16459d799/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/21c90231-d7f2-49bb-97d9-99e16459d799/body
index 504f82b..5fc4981 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/21c90231-d7f2-49bb-97d9-99e16459d799/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/21c90231-d7f2-49bb-97d9-99e16459d799/body
@@ -50,13 +50,3 @@ you switch between branches (effectively switching between revisions)?
 Those are the kind of things that don't really apply when CFBE is just  
 a local interface to a single repository.  If anyone has any advice on  
 how a multi-user interface should work I'd love to hear it!
-
---
-Steve Losh
-http://stevelosh.com/
-
-
-_______________________________________________
-Be-devel mailing list
-Be-devel@bugseverywhere.org
-http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/2496ccca-130b-4459-bfae-9d9ef0138177/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/2496ccca-130b-4459-bfae-9d9ef0138177/body
index e160b76..ed4f97d 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/2496ccca-130b-4459-bfae-9d9ef0138177/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/2496ccca-130b-4459-bfae-9d9ef0138177/body
@@ -1,52 +1,3 @@
 Speaking of that interface, I changed up the look and feel a bit last  
 weekend.  It's still at http://bitbucket.org/sjl/cherryflavoredbugseverywhere/ 
   -- if anyone has any feedback (on any aspect of it) I'd appreciate it.
-
---
-Steve
-
-On Jul 3, 2009, at 8:31 PM, Chris Ball wrote:
-
-> Hi Gianluca,
->
->> As i said in a previous mail, I am working on a "html" command
->> for be.  The goal is to be able to do something like "be html
->> /web/page" to have in the /web/page directory some static html
->> pages that basically are the dump of the be repository, much like
->> ditz have. This will enable a simple and fast publish of the bus
->> list and details on the web, at least in read only mode.
->
-> It might be a good idea for "be html" to use the CherryPy web  
-> interface
-> that Steve is working on.  The command could start up the CherryPy app
-> and scrape all of the available pages to get a stand-alone dump; this
-> would avoid having to keep two (okay, more than two at this point)
-> separate sets of HTML templates in the source tree.  What do you  
-> think?
->
->> 2) I see that every command is implemented with a python file in
->> the becommand dir. For a better code, I'd like to split the
->> command implementation into two files: a file that contain the
->> actual code and a second file that have the html related part,
->> any problem with this ? I don't like to have the html part and
->> the code part in one big and unreadable file.
->
-> I agree that becommands/*.py commands should not contain any HTML
-> layout code.  Putting it somewhere else instead sounds fine.
->
-> Thanks!
->
-> - Chris.
-> -- 
-> Chris Ball   <cjb@laptop.org>
->
-> _______________________________________________
-> Be-devel mailing list
-> Be-devel@bugseverywhere.org
-> http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
-
-
-_______________________________________________
-Be-devel mailing list
-Be-devel@bugseverywhere.org
-http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/42d57a41-219f-46db-9fda-21b42351da63/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/42d57a41-219f-46db-9fda-21b42351da63/body
index f43e8dd..a280d8c 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/42d57a41-219f-46db-9fda-21b42351da63/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/42d57a41-219f-46db-9fda-21b42351da63/body
@@ -23,10 +23,3 @@ multiuser?  (Having it handle more than one "user" logged in at once.)
 Great work, thanks!
 
 - Chris.
--- 
-Chris Ball   <cjb@laptop.org>
-
-_______________________________________________
-Be-devel mailing list
-Be-devel@bugseverywhere.org
-http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/5e339bac-f4f3-407b-974a-b88795d3573b/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/5e339bac-f4f3-407b-974a-b88795d3573b/body
index 7bea88c..593fa83 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/5e339bac-f4f3-407b-974a-b88795d3573b/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/5e339bac-f4f3-407b-974a-b88795d3573b/body
@@ -26,5 +26,3 @@ http://bitbucket.org/sjl/cherryflavoredbugseverywhere/
 Thanks,
 
 - Chris.
--- 
-Chris Ball   <cjb@laptop.org>
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/7fa903a3-f9e6-4e4d-8128-0f26e1ce664b/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/7fa903a3-f9e6-4e4d-8128-0f26e1ce664b/body
index 909b989..d52f4b9 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/7fa903a3-f9e6-4e4d-8128-0f26e1ce664b/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/7fa903a3-f9e6-4e4d-8128-0f26e1ce664b/body
@@ -20,6 +20,3 @@ public, read-only interface too.
 
 If the goal is to allow more than one person to add issues, how should  
 commits go? One commit per change? Commit every X minutes if necessary?
-
---
-Steve
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/e249e2aa-2029-4a96-bc84-962366e07fd6/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/e249e2aa-2029-4a96-bc84-962366e07fd6/body
index 614abd3..a6dd2f1 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/e249e2aa-2029-4a96-bc84-962366e07fd6/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/e249e2aa-2029-4a96-bc84-962366e07fd6/body
@@ -24,10 +24,3 @@ and I'll shut up (or at least move more off-list) ;).
 
 Cheers,
 Trevor
-
--- 
-This email may be signed or encrypted with GPG (http://www.gnupg.org).
-The GPG signature (if present) will be attached as 'signature.asc'.
-For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
-
-My public key is at http://www.physics.drexel.edu/~wking/pubkey.txt
diff --git a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/fa60ce1f-a809-4fb3-a2cd-1a2e0bdd0e0a/body b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/fa60ce1f-a809-4fb3-a2cd-1a2e0bdd0e0a/body
index ae6a5fe..b1db016 100644
--- a/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/fa60ce1f-a809-4fb3-a2cd-1a2e0bdd0e0a/body
+++ b/.be/bea86499-824e-4e77-b085-2d581fa9ccab/bugs/d9959864-ea91-475a-a075-f39aa6760f98/comments/fa60ce1f-a809-4fb3-a2cd-1a2e0bdd0e0a/body
@@ -60,10 +60,3 @@ to work on with the bug fix, and what branches needed to pull the
 eventual fix.  If the initially reported buggy version wasn't actually
 the root of the bug, oh well :p.  Material for a later related bug
 report or a reopen.
-
--- 
-This email may be signed or encrypted with GPG (http://www.gnupg.org).
-The GPG signature (if present) will be attached as 'signature.asc'.
-For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
-
-My public key is at http://www.physics.drexel.edu/~wking/pubkey.txt
diff --git a/misc/xml/be-xml-to-mbox b/misc/xml/be-xml-to-mbox
index 81741bf..e2c8700 100755
--- a/misc/xml/be-xml-to-mbox
+++ b/misc/xml/be-xml-to-mbox
@@ -95,7 +95,7 @@ class Bug (LimitedAttrDict):
             print "Content-Transfer-Encoding: 8bit"
             print "Subject: %s: %s" % (self["short-name"], self["summary"])
             if "extra-strings" in self:
-                for estr in self["extra_strings"]:
+                for estr in self["extra-strings"]:
                     print "X-Extra-String: %s" % estr
             print ""
             print self["summary"]
@@ -164,7 +164,7 @@ class Comment (LimitedAttrDict):
             self["in-reply-to"] = bug["uuid"]
         print "In-Reply-To: %s" % wrap_id(self["in-reply-to"])
         if "extra-strings" in self:
-            for estr in self["extra_strings"]:
+            for estr in self["extra-strings"]:
                 print "X-Extra-String: %s" % estr
         if self["content-type"].startswith("text/"):
             print "Content-Transfer-Encoding: 8bit"