From f369f41d8de3d7d7e5c35c88a9f30000f834cc4a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 24 Jul 2021 04:34:04 -0400
Subject: [PATCH] Fix python deprecation warnings
---
indra/lib/python/indra/util/llmanifest.py | 2 +-
indra/llcorehttp/tests/test_llcorehttp_peer.py | 2 +-
indra/newview/viewer_manifest.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 8d07f32d373..a172e1256cb 100755
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -575,7 +575,7 @@ def replace_in(self, src, dst=None, searchdict={}):
if dst == None:
dst = src
# read src
- f = open(self.src_path_of(src), "rU")
+ f = open(self.src_path_of(src), "r")
contents = f.read()
f.close()
# apply dict replacements
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 4dea099637a..a0302621e70 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
"""\
-@file test_llsdmessage_peer.py
+@file test_llcorehttp_peer.py
@author Nat Goodspeed
@date 2008-10-09
@brief This script asynchronously runs the executable (with args) specified on
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 126b8a8c69b..9fdaad43d23 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -272,7 +272,7 @@ def icon_path(self):
def extract_names(self,src):
try:
- contrib_file = open(src,'rU')
+ contrib_file = open(src,'r')
except IOError:
print("Failed to open '%s'" % src)
raise
--
GitLab