archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

removed check for pyc when scanning the directory of python files.

Browse Source 
Brecht, double checked and pyc or pyo files arent used because of the (file_extension[3] == '\0') test.
This commit is contained in:
Campbell Barton
2009-07-09 07:35:35 +00:00
parent d7a333f83f
commit 1fd38701e9
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/intern/bpy_interface.c
View File

@@ -453,7 +453,7 @@ void BPY_run_ui_scripts(bContext *C, int reload)
char *dirname;
char path[FILE_MAX];
char *dirs[] = {"io", "ui", NULL};
int a, filelen; /* filename length */
int a;
PyGILState_STATE gilstate;
PyObject *mod;
@@ -490,15 +490,10 @@ void BPY_run_ui_scripts(bContext *C, int reload)
/* We could stat the file but easier just to let python
* import it and complain if theres a problem */
if(strstr(de->d_name, ".pyc"))
continue;
file_extension = strstr(de->d_name, ".py");
if(file_extension && *(file_extension + 3) == '\0') {
filelen = strlen(de->d_name);
BLI_strncpy(path, de->d_name, filelen-2); /* cut off the .py on copy */
if(file_extension && file_extension[3] == '\0') {
BLI_strncpy(path, de->d_name, (file_extension - de->d_name) + 1); /* cut off the .py on copy */
mod= PyImport_ImportModuleLevel(path, NULL, NULL, NULL, 0);
if (mod) {
if (reload) {
@@ -511,7 +506,7 @@ void BPY_run_ui_scripts(bContext *C, int reload)
if(mod) {
Py_DECREF(mod); /* could be NULL from reloading */
} else {
BPy_errors_to_report(NULL); // TODO - reports
BPy_errors_to_report(NULL);
fprintf(stderr, "unable to import \"%s\" %s/%s\n", path, dirname, de->d_name);
}