From e61918c4bc750e3d3b700c038492fe9764be5c94 Mon Sep 17 00:00:00 2001
From: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
Date: Fri, 29 Jan 2016 22:25:26 -0800
Subject: [PATCH 1/3] Invoke python as python2

---
 python-docstring.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-docstring.el b/python-docstring.el
index 95ac740..23e1e85 100644
--- a/python-docstring.el
+++ b/python-docstring.el
@@ -73,7 +73,7 @@
                           (shell-command-on-region
                            string-start string-end
                            (format
-                            "python %s --offset %s --indent %s --width %s"
+                            "python2 %s --offset %s --indent %s --width %s"
                             (shell-quote-argument python-docstring-script)
                             orig-offset
                             indent-count

From 4e24e69ada693ea16f0646fd50ef3f5d3d5cb753 Mon Sep 17 00:00:00 2001
From: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
Date: Fri, 29 Jan 2016 22:26:19 -0800
Subject: [PATCH 2/3] Clean up argument parsing.

---
 docstring_wrap.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docstring_wrap.py b/docstring_wrap.py
index 87f4731..7f7cd4d 100644
--- a/docstring_wrap.py
+++ b/docstring_wrap.py
@@ -531,11 +531,11 @@ if __name__ == '__main__':
     import argparse
 
     parser = argparse.ArgumentParser()
-    parser.add_argument("--offset")
-    parser.add_argument("--indent")
-    parser.add_argument("--width")
+    parser.add_argument("--offset", type = int)
+    parser.add_argument("--indent", type = int)
+    parser.add_argument("--width", type = int, default = 79)
     parser.add_argument("--linewise", action='store_true')
-    namespace = parser.parse_args(sys.argv[1:])
+    namespace = parser.parse_args()
 
     from io import StringIO
 
@@ -546,14 +546,12 @@ if __name__ == '__main__':
         inlines.insert(0, "")
     initialBlank, indentCount = indentHeuristic(inlines, io)
     point = 0
-    width = 79
+    width = namespace.width
 
     if namespace.offset is not None:
-        point = int(namespace.offset)
+        point = namespace.offset
     if namespace.indent is not None:
-        indentCount = int(namespace.indent)
-    if namespace.width is not None:
-        width = int(namespace.width)
+        indentCount = namespace.indent
 
     offset = wrapPythonDocstring(
         indata, io,

From 17ae9ab3d2e9ea7097ba407b99762232ebceeae5 Mon Sep 17 00:00:00 2001
From: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
Date: Fri, 29 Jan 2016 22:26:35 -0800
Subject: [PATCH 3/3] Correctly handle markers when parsing fields.

---
 docstring_wrap.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docstring_wrap.py b/docstring_wrap.py
index 7f7cd4d..1bd4dff 100644
--- a/docstring_wrap.py
+++ b/docstring_wrap.py
@@ -263,6 +263,7 @@ class FieldParagraph(RegularParagraph):
         if self.words[0].startswith(':'):
             accumulatedLength = 0
             for word in self.words:
+                word = self.pointTracker.peek(word)
                 # Add the length of the word
                 accumulatedLength += len(word)
                 # Add the following space