diff options
author | Scorpil <scorpilmail@gmail.com> | 2012-07-20 00:52:23 +0300 |
---|---|---|
committer | Scorpil <scorpilmail@gmail.com> | 2012-07-20 00:52:23 +0300 |
commit | c4384043a84b6b495f73f4fb6afc3e2d2d985894 (patch) | |
tree | adea37c8d775db268add915c11fb933668fe679f | |
parent | ead018f7744f0d1f43e9b72cd678aa63309323f6 (diff) | |
parent | a23f3d6143ca866bf990c71162e915c26b7c227e (diff) | |
download | markdown-c4384043a84b6b495f73f4fb6afc3e2d2d985894.tar.gz markdown-c4384043a84b6b495f73f4fb6afc3e2d2d985894.tar.bz2 markdown-c4384043a84b6b495f73f4fb6afc3e2d2d985894.zip |
Merge branch 'master' of github.com:Scorpil/Python-Markdown
Conflicts:
markdown/odict.py
-rw-r--r-- | markdown/odict.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/markdown/odict.py b/markdown/odict.py index 4de4424..d77d701 100644 --- a/markdown/odict.py +++ b/markdown/odict.py @@ -120,8 +120,7 @@ class OrderedDict(dict): try: return self.keyOrder.index(key) except ValueError, e: - raise KeyError("Element '%s' was not found in OrderedDict" % key) - + raise ValueError("Element '%s' was not found in OrderedDict" % key) def index_for_location(self, location): """ Return index or None for a given location. """ |