Default to console for stdout in console.run

 - Fix sphinx conf.py to grab version number from PythonScriptVersion.h
 - docs update for console
 - Update versions and links for website

Author: bruderstein

PythonScript/src/PythonConsole.h

@@ -50,7 +50,9 @@ class PythonConsole : public NppPythonScript::PyProducerConsumer<const char *>,
 		{ 
 			boost::python::object sys_module( (boost::python::handle<>(PyImport_ImportModule("sys"))) );
 			boost::python::object sys_namespace = sys_module.attr("__dict__");	
-			return runCommand(text, sys_namespace["stdout"], sys_namespace["stderr"]); 
+			boost::python::object npp_module( (boost::python::handle<>(PyImport_ImportModule("Npp"))) );
+			boost::python::object npp_namespace = npp_module.attr("__dict__");	
+			return runCommand(text, npp_namespace["console"], sys_namespace["stderr"]); 
 	    }
 
 

docs/source/conf.py

@@ -11,7 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys, os, re
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -48,9 +48,20 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.2.1'
+pyscr_base = r"E:\work\PythonScript"
+version_file = open(pyscr_base + r"\PythonScript\src\PythonScriptVersion.h")
+version_contents = version_file.read()
+version_file.close()
+match = re.search(r'#define PYSCR_VERSION_STRING "([0-9.]+)"', version_contents)
+if match:
+	version = match.group(1)
+	release = match.group(1)
+else:
+	raise RuntimeError("Unknown version")
+	
+#version = '0.6.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.2.1'
+#release = '0.6.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/console.rst

@@ -30,7 +30,9 @@ Console Object
 
    Runs an external program, with output optionally directed to the given objects (which must support a `write` method).
 
-   Not supplying stdout or stderr means that the default values from sys.stdout and sys.stderr (normally the console) are used.
+   Not supplying stdout means that the console is used for stdout.
+   
+   Not supplying stderr means that the default values from sys.stderr (normally the console, in red) is used.
 
    e.g.::
    

docs/source/intro.rst

@@ -79,7 +79,8 @@ You can unregister the callback later, either by using the name of the function,
 A simple example
 ----------------
 
-Let's register a callback for the FILESAVING event - the occurs just before the file is saved, and we'll add a "saved on" log entry to the end of the file, if the filename ends in '.log'.::
+Let's register a callback for the FILESAVING event - the occurs just before the file is saved, 
+and we'll add a "saved on" log entry to the end of the file, if the filename ends in '.log'.::
 
 	import datetime
 	
@@ -103,7 +104,8 @@ Really, we should improve this function a little. Currently, it assumes the file
 
 The ``args`` parameter to the function is a map (similar a dictionary in C# or a hashmap in Java), that contains the arguments for the event - many events are signalled for a ``BufferID``, which is the Notepad++ internal number for a particular file or tab.  We can do things with the bufferID like get the filename, switch to it to make it active and so on.
 
-So, first we'll change it so that we check the filename of the bufferID being saved, rather than the active document. Then, if the filename has a '.log' extension, we'll change to it and add our "File saved on ....." line.
+So, first we'll change it so that we check the filename of the bufferID being saved, rather than the active document. 
+Then, if the filename has a '.log' extension, we'll change to it and add our "File saved on ....." line.::
 
 	import datetime
 	
@@ -116,7 +118,8 @@ So, first we'll change it so that we check the filename of the bufferID being sa
 
 
 
-Great, now it works properly.  There's a side effect though, if we do use save-all, we might change the active document, which might seem a bit strange when we use it.  Again, very easy to fix.
+Great, now it works properly.  There's a side effect though, if we do use save-all, we might change the active document, 
+which might seem a bit strange when we use it.  Again, very easy to fix.::
 
 
 	import datetime

www/download.shtml

@@ -19,10 +19,10 @@ There are two download locations - one's at <a href="http://sourceforge.net/proj
 <br/>
 <br/>
 Here are the local server links if you can't get to sourceforge.
-<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_full_0.6.2.1.7z">Python Script 0.6.2.1 FULL 7zip version (2.8MB)</a>
-<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_full_0.6.2.1.zip">Python Script 0.6.2.1 FULL zip version (4MB)</a>
-<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_min_0.6.2.1.7z">Python Script 0.6.2.1 MINIMUM 7zip version (1.8MB)</a>
-<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_full_0.6.2.1.7z">Python Script 0.6.2.1 MINIMUM zip version (2.8MB)</a>
+<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_full_0.6.3.0.7z">Python Script 0.6.3.0 FULL 7zip version (2.8MB)</a>
+<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_full_0.6.3.0.zip">Python Script 0.6.3.0 FULL zip version (4MB)</a>
+<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_min_0.6.3.0.7z">Python Script 0.6.3.0 MINIMUM 7zip version (1.8MB)</a>
+<br/><a href="http://www.brotherstone.co.uk/npp/ps/downloads/PythonScript_full_0.6.3.0.7z">Python Script 0.6.3.0 MINIMUM zip version (2.8MB)</a>
 <!--<h3><a href="http://sourceforge.net/projects/npppythonscript/files">Ok...I get it already... take me to the downloads</a></h3> -->
 
 

www/header.inc

@@ -27,7 +27,7 @@
 	<br/>
 	<br/>
 	<br/>
-	Latest Version: 0.6.2.1
+	Latest Version: 0.6.3.0
 	<br/>
 	<br/>
 	License: <a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL2</a>