summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2008-09-10 10:15:36 -0400
committerChris Lumens <clumens@redhat.com>2008-09-10 10:15:36 -0400
commitdb869b6906eae59fae06b86852dc8fa68043c38f (patch)
tree3456575e6cc8d41026b714d35f83b329a215f3be
parent4a40c5e707f86d6b669372eb09bdf40b34228f5e (diff)
downloadanaconda-db869b6906eae59fae06b86852dc8fa68043c38f.tar.gz
anaconda-db869b6906eae59fae06b86852dc8fa68043c38f.tar.xz
anaconda-db869b6906eae59fae06b86852dc8fa68043c38f.zip
print doesn't yet support the file= syntax in our version of python.
-rw-r--r--iw/GroupSelector.py4
-rwxr-xr-xscripts/makestamp.py4
-rw-r--r--scripts/maketreeinfo.py16
3 files changed, 12 insertions, 12 deletions
diff --git a/iw/GroupSelector.py b/iw/GroupSelector.py
index 23c27df86..d3571345b 100644
--- a/iw/GroupSelector.py
+++ b/iw/GroupSelector.py
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-import os
+import os, sys
import logging
import gettext
@@ -65,7 +65,7 @@ def sanitizeString(s, translate = True):
try:
s = unicode(s, "utf-8")
except UnicodeDecodeError, e:
- print("Unable to convert %s to a unicode object: %s" % (s, e), file=sys.stderr)
+ sys.stderr.write("Unable to convert %s to a unicode object: %s" % (s, e))
return ""
return s
diff --git a/scripts/makestamp.py b/scripts/makestamp.py
index 5edb86ba0..43ad12798 100755
--- a/scripts/makestamp.py
+++ b/scripts/makestamp.py
@@ -57,7 +57,7 @@ for (str, arg) in args:
usage()
if data["timestamp"] is None:
- print("timestamp not specified; using the current time", file=sys.stderr)
+ sys.stderr.write("timestamp not specified; using the current time")
data["timestamp"] = time.time()
else:
data["timestamp"] = float(data["timestamp"])
@@ -71,7 +71,7 @@ if data["arch"] is None:
data["arch"] = sys.stdin.readline()[:-1]
if data["discNum"] is None and allDiscs is None:
- print("No disc number specified; assuming disc 1", file=sys.stderr)
+ sys.stderr.write("No disc number specified; assuming disc 1")
data["discNum"] = "1"
if data["outfile"] is None:
diff --git a/scripts/maketreeinfo.py b/scripts/maketreeinfo.py
index 573e76fbc..d41de5d3e 100644
--- a/scripts/maketreeinfo.py
+++ b/scripts/maketreeinfo.py
@@ -71,31 +71,31 @@ if type(data["timestamp"]) != float:
data["timestamp"] = float(data["timestamp"])
if data["family"] is None:
- print("--family missing! This is probably bad!", file=sys.stderr)
+ sys.stderr.write("--family missing! This is probably bad!")
data["family"] = ""
if data["variant"] is None:
- print("--variant missing, but that's OK.", file=sys.stderr)
+ sys.stderr.write("--variant missing, but that's OK.")
data["variant"] = ""
if data["version"] is None:
- print("--version missing! This is probably bad!", file=sys.stderr)
+ sys.stderr.write("--version missing! This is probably bad!")
data["version"] = ""
if data["arch"] is None:
- print("--arch missing! This is probably bad!", file=sys.stderr)
+ sys.stderr.write("--arch missing! This is probably bad!")
data["arch"] = ""
-
+
if data["discnum"] is None and allDiscs is None:
- print("--discnum missing; assuming disc 1", file=sys.stderr)
+ sys.stderr.write("--discnum missing; assuming disc 1")
data["discnum"] = "1"
if data["totaldiscs"] is None and allDiscs is None:
- print("--totaldiscs missing; assuming 1", file=sys.stderr)
+ sys.stderr.write("--totaldiscs missing; assuming 1")
data["totaldiscs"] = "1"
if data["packagedir"] is None:
- print("--packagedir missing. This might cause some weirdness.", file=sys.stderr)
+ sys.stderr.write("--packagedir missing. This might cause some weirdness.")
data["packagedir"] = ""