diff -r 39697dcd97e3 Lib/test/test_telnetlib.py --- a/Lib/test/test_telnetlib.py Mon Aug 12 06:51:41 2013 -0700 +++ b/Lib/test/test_telnetlib.py Tue Aug 13 17:03:01 2013 -0400 @@ -74,6 +74,13 @@ telnet.open(HOST, self.port, timeout=30) self.assertEqual(telnet.sock.gettimeout(), 30) telnet.sock.close() + def testGetters(self): + #Test telnet getter methods + telnet = telnetlib.Telnet(HOST, self.port, timeout=30) + t_sock = telnet.sock + self.assertEqual(telnet.get_socket(), t_sock) + self.assertEqual(telnet.fileno(), t_sock.fileno()) + telnet.sock.close() class SocketStub(object): ''' a socket proxy that re-defines sendall() ''' diff -r 39697dcd97e3 Lib/test/test_uu.py --- a/Lib/test/test_uu.py Mon Aug 12 06:51:41 2013 -0700 +++ b/Lib/test/test_uu.py Tue Aug 13 17:03:01 2013 -0400 @@ -196,6 +196,60 @@ finally: self._kill(f) + def test_encode_defaults(self): + try: + f = open(self.tmpin, 'wb') + f.write(plaintext) + f.close() + + uu.encode(self.tmpin, self.tmpout) + + f = open(self.tmpout, 'rb') + data = f.read() + f.close() + + self.assertEqual(data[27:-7], encodedtext) + finally: + self._kill(f) + + @unittest.skipIf('stat' not in dir(os)) + def test_encode_osstat_assert(self): + f = open(self.tmpin, 'wb') + f.write(plaintext) + f.close() + + _stat = os.stat + try: + del os.stat + uu.encode(self.tmpin, self.tmpout) + finally: + os.stat = _stat + + f = open(self.tmpout, 'rb') + data = f.read() + f.close() + + self.assertEqual(int(str(data).split(' ')[1]), 666) + self._kill(f) + + def test_encode_stdin_name(self): + try: + f = open(self.tmpin, 'wb') + f.write(plaintext) + f.close() + + f = open(self.tmpin, 'rb') + uu.encode(f, self.tmpout) + f.close() + + f = open(self.tmpout, 'rb') + data = f.read() + f.close() + + self.assertEqual(str(data).split(' ')[2][0], '-') + finally: + self._kill(f) + def test_decode_filename(self): f = None try: diff -r 39697dcd97e3 Lib/uu.py --- a/Lib/uu.py Mon Aug 12 06:51:41 2013 -0700 +++ b/Lib/uu.py Tue Aug 13 17:03:01 2013 -0400 @@ -51,11 +51,14 @@ elif isinstance(in_file, str): if name is None: name = os.path.basename(in_file) + #Set defaults for mode if mode is None: try: - mode = os.stat(in_file).st_mode + mode_stat = os.stat(in_file) except AttributeError: pass + else: + mode = mode_stat.st_mode in_file = open(in_file, 'rb') opened_files.append(in_file) #