Merge branch 'dev' of github.com:davidhalter/jedi into dev

AUTHORS.txt

@@ -16,3 +16,4 @@ Yasha Borevich (@jjay)
 Aaron Griffin
 andviro (@andviro)
 Mike Gilbert (@floppym)
+Aaron Meurer (@asmeurer)

CONTRIBUTING.md

@@ -6,8 +6,19 @@ are ok in the master branch.
  3. Add your name to AUTHORS.txt
  4. Push to your fork and submit a **pull request to the dev branch**.
 
+If you have have previously filed a GitHub issue and want to contribute code
+that addresses that issue, we prefer it if you use
+[hub](https://github.com/github/hub) to convert your existing issue to a pull
+request. To do that, first push the changes to a separate branch in your fork
+and then issue the following command:
+
+    hub pull-request -b davidhalter:dev -i <issue-number> -h <your-github-username>:<your-branch-name>
+
+It's no strict requirement though, if you don't have hub installed or prefer to
+use the web interface, then feel free to post a traditional pull request.
+
 My **master** branch is a 100% stable (should be). I only push to it after I am
 certain that things are working out. Many people are using Jedi directly from
 the github master branch.
 
-Please use Pep8 to style your code.
+Please use PEP8 to style your code.

README.rst

@@ -131,5 +131,5 @@ For more detailed information visit the `testing documentation
 .. _jedi-vim: https://github.com/davidhalter/jedi-vim
 .. _youcompleteme: http://valloric.github.io/YouCompleteMe/
 .. _Jedi.el: https://github.com/tkf/emacs-jedi
-.. _sublimejedi: https://github.com/svaiter/SublimeJEDI
+.. _sublimejedi: https://github.com/srusskih/SublimeJEDI
 .. _wdb: https://github.com/Kozea/wdb

docs/index.rst

@@ -56,7 +56,7 @@ Emacs:
 
 Sublime Text 2/3:
 
-- `SublimeJEDI <https://github.com/svaiter/SublimeJEDI>`_
+- `SublimeJEDI <https://github.com/srusskih/SublimeJEDI>`_
 
 
 .. _other-software:

setup.py

@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 
 from __future__ import with_statement
-from setuptools import setup
+try:
+    from setuptools import setup
+except ImportError:
+    # Distribute is not actually required to install
+    from distutils.core import setup
 
 __AUTHOR__ = 'David Halter'
 __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'

sith.py

@@ -112,7 +112,10 @@ class TestCase(object):
             if debugger:
                 einfo = sys.exc_info()
                 pdb = __import__(debugger)
-                pdb.post_mortem(einfo if debugger == 'pudb' else einfo[2])
+                if debugger == 'pudb':
+                    pdb.post_mortem(einfo[2], einfo[0], einfo[1])
+                else:
+                    pdb.post_mortem(einfo[2])
             exit(1)
 
     def show(self):