I've now attached a better patch, which is tested at least on UNIX for now. Decided it was better if the optional argument was a function to replace os.getenv, as then it can be called only on demand and there isn't a need to set up information unnecessarily, or call any code more than once.

File Added: patch