Skip to content

Simplify OUTPUT_STYLES constant #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2015
Merged

Simplify OUTPUT_STYLES constant #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions pysass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,6 @@ static union Sass_Value* _error_to_sass_value(PyObject* value);
static union Sass_Value* _unknown_type_to_sass_error(PyObject* value);
static union Sass_Value* _exception_to_sass_error();

struct PySass_Pair {
char *label;
int value;
};

static struct PySass_Pair PySass_output_style_enum[] = {
{(char *) "nested", SASS_STYLE_NESTED},
{(char *) "expanded", SASS_STYLE_EXPANDED},
{(char *) "compact", SASS_STYLE_COMPACT},
{(char *) "compressed", SASS_STYLE_COMPRESSED},
{NULL}
};

static PyObject* _to_py_value(const union Sass_Value* value) {
PyObject* retv = NULL;
Expand Down Expand Up @@ -522,22 +510,17 @@ static PyMethodDef PySass_methods[] = {

static char PySass_doc[] = "The thin binding of libsass for Python.";

void PySass_make_enum_dict(PyObject *enum_dict, struct PySass_Pair *pairs) {
size_t i;
for (i = 0; pairs[i].label; ++i) {
PyDict_SetItemString(
enum_dict,
pairs[i].label,
PySass_Int_FromLong((long) pairs[i].value)
);
}
PyObject* PySass_make_enum_dict() {
PyObject* dct = PyDict_New();
PyDict_SetItemString(dct, "nested", PySass_Int_FromLong(SASS_STYLE_NESTED));
PyDict_SetItemString(dct, "expected", PySass_Int_FromLong(SASS_STYLE_EXPANDED));
PyDict_SetItemString(dct, "compact", PySass_Int_FromLong(SASS_STYLE_COMPACT));
PyDict_SetItemString(dct, "compressed", PySass_Int_FromLong(SASS_STYLE_COMPRESSED));
return dct;
}

void PySass_init_module(PyObject *module) {
PyObject *output_styles;
output_styles = PyDict_New();
PySass_make_enum_dict(output_styles, PySass_output_style_enum);
PyModule_AddObject(module, "OUTPUT_STYLES", output_styles);
PyModule_AddObject(module, "OUTPUT_STYLES", PySass_make_enum_dict());
}

#if PY_MAJOR_VERSION >= 3
Expand Down