summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/JavaCommon.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-02-25 03:02:00 (GMT)
committerGitHub <noreply@github.com>2020-02-25 03:02:00 (GMT)
commit8885f15cf2cb627c0ed83f04f7b542b024ceb00f (patch)
tree68401142b8e08e7373fb16455b2cedbb972805a6 /src/engine/SCons/Tool/JavaCommon.py
parent33e203b5dcf9bc8dc32f78f25d66890358efd1a3 (diff)
parentb6ec4db801b44fe067488f1eab4f7c98b8693d46 (diff)
downloadSCons-8885f15cf2cb627c0ed83f04f7b542b024ceb00f.zip
SCons-8885f15cf2cb627c0ed83f04f7b542b024ceb00f.tar.gz
SCons-8885f15cf2cb627c0ed83f04f7b542b024ceb00f.tar.bz2
Merge pull request #3568 from datalogics-robb/master
Specify encoding for Java files, as the default varies
Diffstat (limited to 'src/engine/SCons/Tool/JavaCommon.py')
-rw-r--r--src/engine/SCons/Tool/JavaCommon.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py
index 1711de1..c6c19ae 100644
--- a/src/engine/SCons/Tool/JavaCommon.py
+++ b/src/engine/SCons/Tool/JavaCommon.py
@@ -404,7 +404,7 @@ if java_parsing:
def parse_java_file(fn, version=default_java_version):
- with open(fn, 'r') as f:
+ with open(fn, 'r', encoding='utf-8') as f:
data = f.read()
return parse_java(data, version)