Merge branch 'master' of github.com:bpython/bpython

sebastinas · sebastinas · commit fa08a03bf29a · 2014-09-29T14:06:12.000+02:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -104,8 +104,8 @@ def exec_code(interpreter, args):
     sys.argv
     """
     with open(args[0], 'r') as sourcefile:
-        code_obj = compile(sourcefile.read(), args[0], 'exec')
+        source = sourcefile.read()
     old_argv, sys.argv = sys.argv, args
     sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
-    interpreter.runcode(code_obj)
+    interpreter.runsource(source, args[0], 'exec')
     sys.argv = old_argv
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -968,14 +968,16 @@ def p_key(self, key):
             return ''
 
         elif key in key_dispatch[config.show_source_key]:
-            source = self.get_source_of_current_name()
-            if source is not None:
+            try:
+                source = self.get_source_of_current_name()
                 if config.highlight_show_source:
                     source = format(PythonLexer().get_tokens(source),
                                     TerminalFormatter())
                 page(source)
-            else:
-                self.statusbar.message(_('Cannot show source.'))
+            except (ValueError, AttributeError, IOError, TypeError), e:
+                self.statusbar.message(_(e))
+            except (NameError), e:
+                self.statusbar.message(_('Cannot get source: %s' % e))
             return ''
 
         elif key in ('\n', '\r', 'PADENTER'):
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1300,14 +1300,17 @@ def pager(self, text):
             self.focus_on_subprocess(command + [tmp.name])
 
     def show_source(self):
-        source = self.get_source_of_current_name()
-        if source is None:
-            self.status_bar.message(_('Cannot show source.'))
-        else:
+        try:
+            source = self.get_source_of_current_name()
             if self.config.highlight_show_source:
-                source = format(PythonLexer().get_tokens(source), TerminalFormatter())
+                source = format(PythonLexer().get_tokens(source),
+                                TerminalFormatter())
             self.pager(source)
-
+        except (ValueError, AttributeError, IOError, TypeError), e:
+            self.status_bar.message(_(e))
+        except (NameError), e:
+            self.status_bar.message(_('Cannot get source: %s' % e))
+        
     def help_text(self):
         return (self.version_help_text() + '\n' + self.key_help_text()).encode('utf8')
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -589,21 +589,23 @@ def get_args(self):
 
     def get_source_of_current_name(self):
         """Return the source code of the object which is bound to the
-        current name in the current input line. Return `None` if the
+        current name in the current input line. Throw exception if the
         source cannot be found."""
-        try:
-            obj = self.current_func
-            if obj is None:
-                line = self.current_line
-                if inspection.is_eval_safe_name(line):
-                    obj = self.get_object(line)
-                if obj is None:
-                    return None
-            source = inspect.getsource(obj)
-        except (AttributeError, IOError, NameError, TypeError):
-            return None
-        else:
-            return source
+        obj = self.current_func
+        if obj is None:
+            line = self.current_line
+            if line == "":
+            	raise ValueError("Nothing to get source of")
+            if inspection.is_eval_safe_name(line):
+                obj = self.get_object(line)
+        try: 
+            inspect.getsource(obj)
+        except TypeError, e:
+            msg = e.message
+            if "built-in" in msg:
+                raise TypeError("Cannot access source of <built-in function %s>" % self.current_line)
+            else:
+                raise TypeError("No source code found for %s" % self.current_line)
 
     def set_docstring(self):
         self.docstring = None
diff --git a/bpython/test/test_args.py b/bpython/test/test_args.py
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -23,7 +23,7 @@ def setup_config(conf):
     config.loadini(config_struct, os.devnull)
     for key, value in conf.items():
         if not hasattr(config_struct, key):
-            raise ValueError("%r is not a valid config attribute", (key,))
+            raise ValueError("%r is not a valid config attribute" % (key,))
         setattr(config_struct, key, value)
     return config_struct
 
@@ -99,7 +99,6 @@ def test_repl(self):
             repl.push('1 / 2')
         self.assertEqual(out.getvalue(), '0.5\n')
 
-    @skip('Failing - this is issue #369')
     def test_interactive(self):
         interp = code.InteractiveInterpreter(locals={})
         with captured_output() as (out, err):
diff --git a/doc/sphinx/source/authors.rst b/doc/sphinx/source/authors.rst
@@ -28,5 +28,5 @@ Other contributors are (in alphabetical order):
 * Marien Zwart <marien dot zwart at gmail dot com>
 
 A big thanks goes out to all the people who help us out by either submitting
-patches, helping us determine problems, our package maintainers and of course
+patches, helping us determine problems, our package maintainers, and of course
 everybody who creates issues for us to fix.
diff --git a/doc/sphinx/source/bpdb.rst b/doc/sphinx/source/bpdb.rst
@@ -14,4 +14,4 @@ This will drop you into bpdb instead of pdb, which works exactly like pdb except
 that you can additionally start bpython at the current stack frame by issuing
 the command `Bpython` or `B`.
 
-You can exit bpython with `^D` to return to bpdb.
+You can exit bpython with `^d` to return to bpdb.
diff --git a/doc/sphinx/source/community.rst b/doc/sphinx/source/community.rst
@@ -15,14 +15,14 @@ worry when you get no response (this does not usually happen) but we are all
 from Europe and when you get to the channel during our nighttime you might have
 to wait a while for a response.
 
-Mailinglist
+Mailing List
 -----------
-We have a mailinglist at `google groups <http://groups.google.com/group/bpython>`_.
+We have a mailing list at `google groups <http://groups.google.com/group/bpython>`_.
 You can post questions there and releases are announced on the mailing
 list.
 
 Website
 -------
 Our main website is http://bpython-interpreter.org/, our documentation can be
-found at http://docs.bpython-interpreter.org/ and our pastebin can be found at
+found at http://docs.bpython-interpreter.org/, and our pastebin can be found at
 http://bpaste.net/.
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -35,7 +35,7 @@ The time between lines before pastemode is activated in seconds (default: 0.02).
 
 hist_length
 ^^^^^^^^^^^
-Number of lines to store in history (set to 0 to disable) (default: 100)
+Number of lines to store in history (set to 0 to disable) (default: 100).
 
 tab_length
 ^^^^^^^^^^
@@ -45,24 +45,24 @@ pastebin_url
 ^^^^^^^^^^^^
 The pastebin url to post to (without a trailing slash). This pastebin has to be
 a pastebin which uses provides a similar interface to ``bpaste.net``'s JSON
-interface. (default: https://bpaste.net/json/new)
+interface (default: https://bpaste.net/json/new).
 
 pastebin_show_url
 ^^^^^^^^^^^^^^^^^
 The url under which the new paste can be reached. ``$paste_id`` will be replaced
-by the ID of the new paste. (default: https://bpaste.net/show/$paste_id/)
+by the ID of the new paste (default: https://bpaste.net/show/$paste_id/).
 
 pastebin_removal_url
 ^^^^^^^^^^^^^^^^^^^^
 The url under which a paste can be removed. ``$removal_id`` will be replaced
-by the removal ID of the paste. (default: https://bpaste.net/remova/$removal_id/)
+by the removal ID of the paste (default: https://bpaste.net/remova/$removal_id/).
 
 .. versionadded:: 0.14
 
 pastebin_expiry
 ^^^^^^^^^^^^^^^
 Time duration after which a paste should expire. Valid values are ``1day``,
-``1week`` and ``1month``. (default: ``1week``)
+``1week`` and ``1month`` (default: ``1week``).
 
 .. versionadded:: 0.14
 
diff --git a/doc/sphinx/source/contributing.rst b/doc/sphinx/source/contributing.rst
@@ -5,7 +5,7 @@ Contributing to bpython
 
 Thanks for working on bpython!
 
-On the `GitHub issue tracker`_ some issues are labeled bite-size_
+On the `GitHub issue tracker`_ some issues are labeled bite-size_ -
 these are particularly good ones to start out with.
 
 See our section about the :ref:`community` for a list of resources.
@@ -16,43 +16,55 @@ to get a question answered depending on the time of day.
 Getting your development environment set up
 -------------------------------------------
 
+bpython supports Python 2.6, 2.7, 3.3 and 3.4. The code is written in Python
+2 and transformed for Python 3 with 2to3. This means that it's easier
+to work on bpython with Python 2 because it's you can use `python setup.py develop`
+(`development mode
+<https://pythonhosted.org/setuptools/setuptools.html#development-mode>`_ installs
+by linking to the bpython source instead of copying it over)
+in a more straightforward way to have your changes immediately reflected by
+your bpython installation and the `bpython`, `bpython-curtsies`, and `bpython-urwid`
+commands.
+
 Using a virtual environment is probably a good idea. Create a virtual environment with
 
 .. code-block:: bash
 
-    $ virtualenv bpython-dev
-    $ source bpython-dev/bin/activate   # this step is necssary every time you work on bpython
-    <hack on bpython>
-    $ deactivate                        # back to normal system environment
+    $ virtualenv bpython-dev            # determines Python version used
+    $ source bpython-dev/bin/activate   # necssary every time you work on bpython
 
-Fork `bpython` in the GitHub web interface, then clone the repo:
+Fork bpython in the GitHub web interface, then clone the repo:
 
 .. code-block:: bash
 
     $ git clone git@github.com:YOUR_GITHUB_USERNAME/bpython.git
+    $ # or "git clone https://github.com/YOUR_GITHUB_USERNAME/bpython.git"
 
-Next install this development version of `bpython`:
+Next install the dependencies and install your development copy of bpython:
 
 .. code-block:: bash
 
-    $ pip install pygments curtsies greenlet watchdog urwid  # install all the dependencies
-    $ pip install sphinx mock                                # development dependencies
+    $ pip install pygments requests                  # install required dependencies
+    $ pip install curtsies greenlet watchdog urwid   # install optional dependencies
+    $ pip install sphinx mock nosetests              # development dependencies
     $ cd bpython
     $ python setup.py develop
     <modify a file in some way>
     $ bpython-curtsies      # this runs your modified copy of bpython!
 
 As a first dev task, I recommend getting `bpython` to print your name every time you hit a specific key.
 
-To run tests:
+To run tests from the bpython directory:
+
+.. code-block:: bash
 
-    $ python -m unittest discover bpython
+    $ nosetests
 
 To build the docs:
 ------------------
 
-The documentation is included in the regular `bpython` repository. After
-checking out the `bpython` repository and installing `sphinx` as described in
+The documentation is included in the bpython repository. After
+checking out the bpython repository and installing `sphinx` as described in
 the previous step, you can run the following command in your checkout of the
 repository to build the documentation:
 
@@ -63,11 +75,10 @@ repository to build the documentation:
 Afterwards you can point your browser to `doc/sphinx/build/html/index.html`.
 Don't forget to recreate the HTML after you make changes.
 
-
 To hack on the site or theme
 ----------------------------
 
-The site (and it's theme as well) is stored in a separate repository and built using
+The site (and its theme as well) is stored in a separate repository and built using
 pelican. To start hacking on the site you need to start out with a checkout and
 probably a virtual environment:
 
diff --git a/doc/sphinx/source/django.rst b/doc/sphinx/source/django.rst
@@ -12,7 +12,7 @@ out of the box models and views for a lot of stuff.
 For those people wanting to use bpython with their Django installation you can
 follow the following steps. Written by Chanita Siridechkun. The following
 instructions make bpython try to import a setting module in the current folder
-and let django set up it's enviroment with the settings module (if found) if
+and let django set up its enviroment with the settings module (if found) if
 bpython can't find the settings module nothing happens and no enviroment gets
 set up.
 
