Incubates #6854 (issue #6845): Update to pySerial 2.7.

.gitmodules

@@ -13,3 +13,7 @@
 [submodule "include/sonic"]
 	path = include/sonic
 	url = https://github.com/waywardgeek/sonic.git
+[submodule "include/pyserial"]
+	path = include/pyserial
+	url = https://github.com/pyserial/pyserial.git
+	ignore = untracked

readme.md

@@ -67,7 +67,7 @@ For reference, the following dependencies are included in Git submodules:
 * lilli.dll, version 2.1.0.0
 * [Handy Tech Braille SDK, version 1.4.2.0](ftp://ftp.handytech.de/public/Software/BrailleDriver/HTBrailleSDK_1420a.zip)
 * Updated Handy Tech sbsupport.dll and dealers.dat received on 2014-09-09
-* [pyserial](http://pypi.python.org/pypi/pyserial), version 2.5
+* [pyserial](http://pypi.python.org/pypi/pyserial), version 2.7
 * HanSoneConnect.dll, version 2.0.0.1
 * SyncBraille.dll, version 1.0.0.1
 * [Python interface to FTDI driver/chip](http://fluidmotion.dyndns.org/zenphoto/index.php?p=news&title=Python-interface-to-FTDI-driver-chip)

sconstruct

@@ -1,7 +1,7 @@
 ###
 #This file is a part of the NVDA project.
 #URL: http://www.nvaccess.org/
-#Copyright 2010-2016 NV Access Limited.
+#Copyright 2010-2017 NV Access Limited.
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License version 2.0, as published by
 #the Free Software Foundation.
@@ -17,6 +17,7 @@ import os
 import time
 import _winreg
 from glob import glob
+import sourceEnv
 
 def recursiveCopy(env,targetDir,sourceDir):
 	targets=[]
@@ -89,7 +90,7 @@ if len(unknown)>0:
 	Exit(1)
 
 #Ensure that any Python subprocesses (such as for py2exe) can find our Python directory in miscDeps
-env['ENV']['PYTHONPATH']=Dir('#miscDeps/python').abspath
+env['ENV']['PYTHONPATH']=";".join(sourceEnv.PYTHON_DIRS)
 
 env["copyright"]=versionInfo.copyright
 env['version_year']=versionInfo.version_year

source/sourceEnv.py

@@ -1,6 +1,6 @@
 #sourceEnv.py
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2013 NV Access Limited
+#Copyright (C) 2013-2017 NV Access Limited
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
@@ -10,5 +10,14 @@
 import sys
 import os
 
-sys.path.insert(1, os.path.abspath(
-	os.path.join(__file__, "..", "..", "miscDeps", "python")))
+# Get the path to the top of the repo; i.e. where include and miscDeps are.
+TOP_DIR = os.path.dirname(os.path.dirname(__file__))
+# Directories containing Python modules included in git submodules.
+PYTHON_DIRS = (
+	os.path.join(TOP_DIR, "include", "pyserial"),
+	os.path.join(TOP_DIR, "miscDeps", "python"),
+)
+
+# sys.path[0] will always be the current dir, which should take precedence.
+# Insert our include paths after that.
+sys.path[1:1] = PYTHON_DIRS