Skip to content

Commit 45ba48c

Browse files
committed
modules: drop references to IOError
Since Python 3.0 it is an alias for OSError.
1 parent 774e1d0 commit 45ba48c

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/systemd/_journal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static PyObject* journal_sendv(PyObject *self _unused_, PyObject *args) {
4848
r = sd_journal_sendv(iov, argc);
4949
if (r < 0) {
5050
errno = -r;
51-
PyErr_SetFromErrno(PyExc_IOError);
51+
PyErr_SetFromErrno(PyExc_OSError);
5252
goto out;
5353
}
5454

@@ -80,7 +80,7 @@ static PyObject* journal_stream_fd(PyObject *self _unused_, PyObject *args) {
8080
fd = sd_journal_stream_fd(identifier, priority, level_prefix);
8181
if (fd < 0) {
8282
errno = -fd;
83-
return PyErr_SetFromErrno(PyExc_IOError);
83+
return PyErr_SetFromErrno(PyExc_OSError);
8484
}
8585

8686
return PyLong_FromLong(fd);

src/systemd/id128.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static PyObject* make_uuid(sd_id128_t id) {
7979
r = sd_id128_##name(&id); \
8080
if (r < 0) { \
8181
errno = -r; \
82-
return PyErr_SetFromErrno(PyExc_IOError); \
82+
return PyErr_SetFromErrno(PyExc_OSError); \
8383
} \
8484
\
8585
return make_uuid(id); \
@@ -114,7 +114,7 @@ static PyObject *get_machine_app_specific(PyObject *self _unused_, PyObject *arg
114114
PyBuffer_Release(&buffer);
115115
if (r < 0) {
116116
errno = -r;
117-
return PyErr_SetFromErrno(PyExc_IOError);
117+
return PyErr_SetFromErrno(PyExc_OSError);
118118
}
119119

120120
return make_uuid(app_id);

src/systemd/login.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static PyObject* name(PyObject *self _unused_, PyObject *args) { \
2424
r = sd_get_##name(&list); \
2525
if (r < 0) { \
2626
errno = -r; \
27-
return PyErr_SetFromErrno(PyExc_IOError); \
27+
return PyErr_SetFromErrno(PyExc_OSError); \
2828
} \
2929
\
3030
PyObject *ans = PyList_New(r); \
@@ -58,7 +58,7 @@ static PyObject* uids(PyObject *self _unused_, PyObject *args) {
5858
r = sd_get_uids(&list);
5959
if (r < 0) {
6060
errno = -r;
61-
return PyErr_SetFromErrno(PyExc_IOError);
61+
return PyErr_SetFromErrno(PyExc_OSError);
6262
}
6363

6464
PyObject *ans = PyList_New(r);

src/systemd/test/test_id128.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
def skip_oserror(*errnos):
1212
try:
1313
yield
14-
except (OSError, IOError) as e:
14+
except OSError as e:
1515
if e.errno in errnos:
1616
pytest.skip()
1717
raise

src/systemd/test/test_journal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def send(self, MESSAGE, MESSAGE_ID=None,
4747
def skip_oserror(code):
4848
try:
4949
yield
50-
except (OSError, IOError) as e:
50+
except OSError as e:
5151
if e.errno == code:
5252
pytest.skip()
5353
raise

src/systemd/test/test_login.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
def skip_oserror(code):
1313
try:
1414
yield
15-
except (OSError, IOError) as e:
15+
except OSError as e:
1616
if e.errno == code:
1717
pytest.skip()
1818
raise

0 commit comments

Comments
 (0)