Browse Source

Renamed _trash_* modules to _send2trash_* and added python wrapper around them.

--HG--
rename : modules/trash_osx.c => modules/send2trash_osx.c
rename : modules/trash_win.c => modules/send2trash_win.c
pull/6/head
Virgil Dupras 11 years ago
parent
commit
8a1dff2947
  1. 1
      .hgignore
  2. 8
      modules/send2trash_osx.c
  3. 8
      modules/send2trash_win.c
  4. 8
      send2trash/__init__.py
  5. 6
      send2trash/plat_osx.py
  6. 9
      send2trash/plat_win.py
  7. 10
      setup.py

1
.hgignore

@ -1,4 +1,5 @@
syntax: glob
*.pyc
build
.DS_Store

8
modules/trash_osx.c → modules/send2trash_osx.c

@ -2,7 +2,7 @@
#include "Python.h"
#include <CoreServices/CoreServices.h>
static PyObject* trash_osx_send(PyObject *self, PyObject *args)
static PyObject* send2trash_osx_send(PyObject *self, PyObject *args)
{
UInt8 *utf8_chars;
FSRef fp;
@ -22,13 +22,13 @@ static PyObject* trash_osx_send(PyObject *self, PyObject *args)
}
static PyMethodDef TrashMethods[] = {
{"send", trash_osx_send, METH_VARARGS, ""},
{"send", send2trash_osx_send, METH_VARARGS, ""},
};
PyMODINIT_FUNC
init_trash_osx(void)
init_send2trash_osx(void)
{
PyObject *m = Py_InitModule("_trash_osx", TrashMethods);
PyObject *m = Py_InitModule("_send2trash_osx", TrashMethods);
if (m == NULL) {
return;
}

8
modules/trash_win.c → modules/send2trash_win.c

@ -9,7 +9,7 @@
rather than sending it to trash.
*/
static PyObject* trash_win_send(PyObject *self, PyObject *args)
static PyObject* send2trash_win_send(PyObject *self, PyObject *args)
{
SHFILEOPSTRUCTW op;
PyObject *filepath;
@ -47,14 +47,14 @@ static PyObject* trash_win_send(PyObject *self, PyObject *args)
}
static PyMethodDef TrashMethods[] = {
{"send", trash_win_send, METH_VARARGS, ""},
{"send", send2trash_win_send, METH_VARARGS, ""},
{NULL, NULL, 0, NULL}
};
PyMODINIT_FUNC
init_trash_win(void)
init_send2trash_win(void)
{
PyObject *m = Py_InitModule("_trash_win", TrashMethods);
PyObject *m = Py_InitModule("_send2trash_win", TrashMethods);
if (m == NULL) {
return;
}

8
send2trash/__init__.py

@ -0,0 +1,8 @@
import sys
if sys.platform == 'darwin':
from plat_osx import send2trash
elif sys.platform == 'win32':
from plat_win import send2trash
else:
print "Unsupported platform"

6
send2trash/plat_osx.py

@ -0,0 +1,6 @@
import _send2trash_osx
def send2trash(path):
if not isinstance(path, unicode):
path = unicode(path, 'utf-8')
_send2trash_osx.send(path)

9
send2trash/plat_win.py

@ -0,0 +1,9 @@
import os.path as op
import _send2trash_win
def send2trash(path):
if not isinstance(path, unicode):
path = unicode(path, 'mbcs')
if not op.isabs(path):
path = op.abspath(path)
_send2trash_win.send(path)

10
setup.py

@ -1,21 +1,21 @@
import sys
import os.path as op
from distutils.core import setup
from setuptools import setup
from distutils.extension import Extension
exts = []
if sys.platform == 'darwin':
exts.append(Extension(
'_trash_osx',
[op.join('modules', 'trash_osx.c')],
'_send2trash_osx',
[op.join('modules', 'send2trash_osx.c')],
extra_link_args=['-framework', 'CoreServices'],
))
if sys.platform == 'win32':
exts.append(Extension(
'_trash_win',
[op.join('modules', 'trash_win.c')],
'_send2trash_win',
[op.join('modules', 'send2trash_win.c')],
extra_link_args = ['shell32.lib'],
))

Loading…
Cancel
Save