You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

47 lines
1.5 KiB

36 years ago
36 years ago
Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r69364 | kristjan.jonsson | 2009-02-06 04:17:34 -0600 (Fri, 06 Feb 2009) | 1 line Fix a number of Win32ErrorTests error cases. chmod wasn't being tested. 'access' never raises an error. ........ r69365 | armin.rigo | 2009-02-06 05:46:26 -0600 (Fri, 06 Feb 2009) | 2 lines Ivan on IRC in #twisted reported this crasher. ........ r69409 | georg.brandl | 2009-02-07 06:21:17 -0600 (Sat, 07 Feb 2009) | 1 line #5174: fix wrong file closing in example. ........ r69410 | neil.schemenauer | 2009-02-07 08:53:31 -0600 (Sat, 07 Feb 2009) | 4 lines Fix broken test in test_hotshot. Treating the current directory as an empty file is sloppy and non-portable. Use NamedTemporaryFile to make an empty file. ........ r69413 | neil.schemenauer | 2009-02-07 12:35:16 -0600 (Sat, 07 Feb 2009) | 2 lines Add test for issue #999042, explict global statement works. ........ r69417 | benjamin.peterson | 2009-02-07 17:01:19 -0600 (Sat, 07 Feb 2009) | 1 line document individual 2to3 fixers ........ r69435 | benjamin.peterson | 2009-02-08 08:38:13 -0600 (Sun, 08 Feb 2009) | 1 line document numliterals fixer ........ r69442 | benjamin.peterson | 2009-02-08 09:14:57 -0600 (Sun, 08 Feb 2009) | 1 line a few edits and typos ........ r69447 | vinay.sajip | 2009-02-08 13:06:08 -0600 (Sun, 08 Feb 2009) | 2 lines Issue #5170: Fixed Unicode output bug in logging and added test case. This is a regression which did not occur in 2.5. ........ r69495 | kristjan.jonsson | 2009-02-10 07:32:24 -0600 (Tue, 10 Feb 2009) | 1 line Issue 4804. Add a function to test the validity of file descriptors on Windows, and stop using global runtime settings to silence the warnings / assertions. ........ r69519 | gregory.p.smith | 2009-02-11 17:45:25 -0600 (Wed, 11 Feb 2009) | 3 lines Issue #1008086: Fixes socket.inet_aton() to always return 4 bytes even on LP64 platforms (most 64-bit Linux, bsd, unix systems). ........ r69520 | benjamin.peterson | 2009-02-11 21:50:00 -0600 (Wed, 11 Feb 2009) | 1 line os.fsync() should be used to ensure that data is written to disk ........ r69521 | benjamin.peterson | 2009-02-11 22:17:04 -0600 (Wed, 11 Feb 2009) | 1 line no need for this __bases__ trick anymore ........
17 years ago
  1. /* File object interface (what's left of it -- see io.py) */
  2. #ifndef Py_FILEOBJECT_H
  3. #define Py_FILEOBJECT_H
  4. #ifdef __cplusplus
  5. extern "C" {
  6. #endif
  7. #define PY_STDIOTEXTMODE "b"
  8. PyAPI_FUNC(PyObject *) PyFile_FromFd(int, const char *, const char *, int,
  9. const char *, const char *,
  10. const char *, int);
  11. PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int);
  12. PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int);
  13. PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *);
  14. PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *);
  15. #ifndef Py_LIMITED_API
  16. PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
  17. #endif
  18. /* The default encoding used by the platform file system APIs
  19. If non-NULL, this is different than the default encoding for strings
  20. */
  21. PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
  22. PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
  23. /* Internal API
  24. The std printer acts as a preliminary sys.stderr until the new io
  25. infrastructure is in place. */
  26. #ifndef Py_LIMITED_API
  27. PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);
  28. PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
  29. #endif /* Py_LIMITED_API */
  30. /* A routine to check if a file descriptor can be select()-ed. */
  31. #ifdef HAVE_SELECT
  32. #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE))
  33. #else
  34. #define _PyIsSelectable_fd(FD) (1)
  35. #endif /* HAVE_SELECT */
  36. #ifdef __cplusplus
  37. }
  38. #endif
  39. #endif /* !Py_FILEOBJECT_H */