~ubuntu-branches/ubuntu/saucy/uwsgi/saucy

« back to all changes in this revision

Viewing changes to plugins/python/pyloader.c

  • Committer: Package Import Robot
  • Author(s): Janos Guljas
  • Date: 2012-04-30 17:35:22 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120430173522-qucwu1au3s9bflhb
Tags: 1.2+dfsg-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
425
425
 
426
426
doh:
427
427
        free(mountpoint);
428
 
        PyErr_Print();
 
428
        if (PyErr_Occurred())
 
429
                PyErr_Print();
429
430
#ifdef UWSGI_MINTERPRETERS
430
431
        if (interpreter == NULL && id) {
431
432
                Py_EndInterpreter(wi->interpreter);
481
482
 
482
483
        PyObject *tmp_callable;
483
484
        PyObject *applications;
484
 
#ifndef UWSGI_PYPY
485
485
        PyObject *uwsgi_dict = get_uwsgi_pydict("uwsgi");
486
 
#endif
487
486
 
488
487
        char *module = (char *) arg1;
489
488
 
506
505
                return NULL;
507
506
        }
508
507
 
509
 
#ifndef UWSGI_PYPY
510
508
        applications = PyDict_GetItemString(uwsgi_dict, "applications");
511
509
        if (applications && PyDict_Check(applications)) return applications;
512
 
#endif
513
 
 
514
510
 
515
511
        applications = PyDict_GetItemString(wsgi_dict, "applications");
516
512
        if (applications && PyDict_Check(applications)) return applications;
714
710
 
715
711
PyObject *uwsgi_eval_loader(void *arg1) {
716
712
 
717
 
#ifndef UWSGI_PYPY
718
 
 
 
713
#ifdef UWSGI_PYPY
 
714
        uwsgi_log("the eval loader is currently not supported under PyPy !!!\n");
 
715
        return NULL;
 
716
#else
719
717
        char *code = (char *) arg1;
720
718
 
721
719
        PyObject *wsgi_eval_module, *wsgi_eval_callable = NULL;
771
769
        }
772
770
 
773
771
        return wsgi_eval_callable;
774
 
#else
775
 
        return NULL;
776
772
#endif
777
773
 
778
774
}