From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 1 Sep 2011 22:13:16 +0000 (+0200)
Subject: Merge 3.2: Remove unused variable if Python is build without threads
X-Git-Tag: v3.3.0a1~1583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22d80bcf1b8696604884825715321def0a980cd6;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2: Remove unused variable if Python is build without threads
---

22d80bcf1b8696604884825715321def0a980cd6
diff --cc Python/import.c
index 19e975a593dc,93defeff7fb4..141124830a00
--- a/Python/import.c
+++ b/Python/import.c
@@@ -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();