]> granicus.if.org Git - python/commitdiff
Merge 3.2: Remove unused variable if Python is build without threads
authorVictor Stinner <victor.stinner@haypocalc.com>
Thu, 1 Sep 2011 22:13:16 +0000 (00:13 +0200)
committerVictor Stinner <victor.stinner@haypocalc.com>
Thu, 1 Sep 2011 22:13:16 +0000 (00:13 +0200)
1  2 
Python/import.c

diff --cc Python/import.c
index 19e975a593dcd80826cf458a7d32d53032b2a678,93defeff7fb41bf5d755ebadf3d6479143f03aba..141124830a00237107a6f19560dbe05d23f41875
@@@ -2652,8 -2347,11 +2652,10 @@@ PyImport_ImportModule(const char *name
  PyObject *
  PyImport_ImportModuleNoBlock(const char *name)
  {
 -    PyObject *result;
 -    PyObject *modules;
 +    PyObject *nameobj, *modules, *result;
+ #ifdef WITH_THREAD
      long me;
+ #endif
  
      /* Try to get the module from sys.modules[name] */
      modules = PyImport_GetModuleDict();