Issue 2255: Handle scanning of UTF-8 and UTF-16 files. (Greg Spencer)

4 files changed, 10 insertions, 10 deletions

diff --git a/doc/SConscript b/doc/SConscript
index e010ebf..e4668fc 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -76,7 +76,7 @@ format_re = re.compile(r'<(?:graphic|imagedata)\s+fileref="([^"]*)"(?:\s+format=
 def scanxml(node, env, target):
     includes = []
 
-    contents = node.get_contents()
+    contents = node.get_text_contents()
 
     includes.extend(entity_re.findall(contents))
 
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 300e14c..5526c5e 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -9391,7 +9391,7 @@ source files of different types:
 
 .ES
 def xyz_scan(node, env, path):
-    contents = node.get_contents()
+    contents = node.get_text_contents()
     # Scan the contents and return the included files.
 
 XYZScanner = Scanner(xyz_scan)
@@ -9663,7 +9663,7 @@ import re
 include_re = re.compile(r'^include\\s+(\\S+)$', re.M)
 
 def kfile_scan(node, env, path, arg):
-    contents = node.get_contents()
+    contents = node.get_text_contents()
     includes = include_re.findall(contents)
     return includes
 
@@ -9692,7 +9692,7 @@ for files that actually exist:
 include_re = re.compile(r'^include\\s+(\\S+)$', re.M)
 
 def my_scan(node, env, path, arg):
-   contents = node.get_contents()
+   contents = node.get_text_contents()
    includes = include_re.findall(contents)
    if includes == []:
         return []
diff --git a/doc/user/scanners.in b/doc/user/scanners.in
index 63c0722..c585230 100644
--- a/doc/user/scanners.in
+++ b/doc/user/scanners.in
@@ -170,7 +170,7 @@ over the file scanning rather than being called for each input line:
       include_re = re.compile(r'^include\s+(\S+)$', re.M)
       
       def kfile_scan(node, env, path, arg):
-          contents = node.get_contents()
+          contents = node.get_text_contents()
           return include_re.findall(contents)
     </programlisting>
 
@@ -199,7 +199,7 @@ over the file scanning rather than being called for each input line:
       The path name to the file can be
       used by converting the node to a string
       using the <literal>str()</literal> function,
-      or an internal &SCons; <literal>get_contents()</literal>
+      or an internal &SCons; <literal>get_text_contents()</literal>
       object method can be used to fetch the contents.
 
       </para>
@@ -281,7 +281,7 @@ over the file scanning rather than being called for each input line:
         include_re = re.compile(r'^include\s+(\S+)$', re.M)
 
         def kfile_scan(node, env, path):
-            contents = node.get_contents()
+            contents = node.get_text_contents()
             includes = include_re.findall(contents)
             return includes
 
diff --git a/doc/user/scanners.xml b/doc/user/scanners.xml
index c068d03..0fa4d2e 100644
--- a/doc/user/scanners.xml
+++ b/doc/user/scanners.xml
@@ -170,7 +170,7 @@ over the file scanning rather than being called for each input line:
       include_re = re.compile(r'^include\s+(\S+)$', re.M)
       
       def kfile_scan(node, env, path, arg):
-          contents = node.get_contents()
+          contents = node.get_text_contents()
           return include_re.findall(contents)
     </programlisting>
 
@@ -199,7 +199,7 @@ over the file scanning rather than being called for each input line:
       The path name to the file can be
       used by converting the node to a string
       using the <literal>str()</literal> function,
-      or an internal &SCons; <literal>get_contents()</literal>
+      or an internal &SCons; <literal>get_text_contents()</literal>
       object method can be used to fetch the contents.
 
       </para>
@@ -280,7 +280,7 @@ over the file scanning rather than being called for each input line:
         include_re = re.compile(r'^include\s+(\S+)$', re.M)
 
         def kfile_scan(node, env, path):
-            contents = node.get_contents()
+            contents = node.get_text_contents()
             includes = include_re.findall(contents)
             return includes