svn commit: r926457 - in /lucene/pylucene/trunk/jcc: jcc/windows.py setup.py

[va...@apache.org]

Author: vajda
Date: Tue Mar 23 03:23:28 2010
New Revision: 926457

URL: http://svn.apache.org/viewvc?rev=926457&view=rev
Log:
debugged registry stuff

Modified:
    lucene/pylucene/trunk/jcc/jcc/windows.py
    lucene/pylucene/trunk/jcc/setup.py

Modified: lucene/pylucene/trunk/jcc/jcc/windows.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/windows.py?rev=926457&r1=926456&r2=926457&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/windows.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/windows.py Tue Mar 23 03:23:28 2010
@@ -20,13 +20,13 @@ class WindowsRegistry(object):
 
     def get(self, key, name):
 
-        key = None
+        handle = None
         try:
-            key = _winreg.OpenKey(self.handle, keyname)
-            return _winreg.QueryValueEx(key, name)[0]
+            handle = _winreg.OpenKey(self.handle, key)
+            return _winreg.QueryValueEx(handle, name)[0]
         finally:
-            if key is not None:
-                key.Close()
+            if handle is not None:
+                handle.Close()
 
     def close(self):
         self.handle.Close()
@@ -70,7 +70,7 @@ def get_jvm_dll_directory(client_or_serv
         if os.path.exists(os.path.join(path, "jvm.dll")):
             return path
 
-     return None
+    return None
 
 
 def add_jvm_dll_directory_to_path():

Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=926457&r1=926456&r2=926457&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Tue Mar 23 03:23:28 2010
@@ -143,8 +143,8 @@ JAVAC = {
     'ipod': ['jikes', '-cp', '/usr/share/classpath/glibj.zip'],
     'linux2': ['javac'],
     'sunos5': ['javac'],
-    'win32': ['%(win32)s/bin/javac.exe' % (JDK)],
-    'mingw32': ['%(mingw32)s/bin/javac.exe' % (JDK)],
+    'win32': ['%(win32)s/bin/javac.exe' %(JDK)],
+    'mingw32': ['%(mingw32)s/bin/javac.exe' %(JDK)],
     'freebsd7': ['javac'],
 }