1.1 --- a/WebStack/Helpers/Request.py Sat Oct 27 21:34:37 2007 +0000
1.2 +++ b/WebStack/Helpers/Request.py Sat Oct 27 21:35:04 2007 +0000
1.3 @@ -195,17 +195,44 @@
1.4 self.cache = None
1.5
1.6 def __getattr__(self, name):
1.7 +
1.8 + """
1.9 + Provides a property value when 'name' is specified as "content".
1.10 + """
1.11 +
1.12 if name != "content":
1.13 raise AttributeError, name
1.14 +
1.15 if self.cache is not None:
1.16 return self.cache
1.17 - if hasattr(self.stream, "seek"):
1.18 - self.stream.seek(0)
1.19 +
1.20 + if self.reset():
1.21 return self.stream.read()
1.22 else:
1.23 self.cache = self.stream.read()
1.24 return self.cache
1.25
1.26 + def reset(self):
1.27 +
1.28 + "Reset the stream providing the data, returning whether this succeeded."
1.29 +
1.30 + # Python file objects.
1.31 +
1.32 + if hasattr(self.stream, "seek"):
1.33 + self.stream.seek(0)
1.34 + return 1
1.35 +
1.36 + # Java input streams.
1.37 +
1.38 + elif hasattr(self.stream, "reset"):
1.39 + self.stream.reset()
1.40 + return 1
1.41 +
1.42 + # Other streams.
1.43 +
1.44 + else:
1.45 + return 0
1.46 +
1.47 def __str__(self):
1.48 return self.content
1.49