diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 49394172e..4afbcdbfc 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -127,7 +127,7 @@ class Cmdoption(ObjectDescription):
     Description of a command-line option (.. cmdoption).
     """
 
-    def parse_signature(self, sig, signode):
+    def handle_signature(self, sig, signode):
         """Transform an option description into RST nodes."""
         count = 0
         firstname = ''
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index 7381d5ead..bd263545d 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -29,6 +29,7 @@ from docutils.utils import relative_path
 import jinja2
 
 import sphinx
+from sphinx.errors import PycodeError
 
 # Errnos that we need.
 EEXIST = getattr(errno, 'EEXIST', 0)