[ctypes-commit] ctypes/ctypes _loader.py,1.1.2.8,1.1.2.9

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/ctypes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18138

Modified Files:
      Tag: branch_1_0
	_loader.py 
Log Message:
Remove unneeded default argument from _plat_load_version.  And more.


Index: _loader.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/ctypes/Attic/_loader.py,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** _loader.py	26 Jan 2006 07:24:16 -0000	1.1.2.8
--- _loader.py	26 Jan 2006 07:44:45 -0000	1.1.2.9
***************
*** 110,119 ****
          if mode is None:
              mode = self._mode
!         return self._dlltype(_dyld_find(libname), mode)
  
!     # Helper for load_version - assembles a filename from name and filename
      if os.name in ("nt", "ce"):
          # Windows (XXX what about cygwin?)
!         def _plat_load_version(self, name, version, mode=None):
              # not sure if this makes sense
              if version is not None:
--- 110,119 ----
          if mode is None:
              mode = self._mode
!         return self._load(libname, mode)
  
!     # Helpers for load and load_version - assembles a filename from name and filename
      if os.name in ("nt", "ce"):
          # Windows (XXX what about cygwin?)
!         def _plat_load_version(self, name, version, mode):
              # not sure if this makes sense
              if version is not None:
***************
*** 121,137 ****
              return self.load(name, mode)
  
      elif os.name == "posix" and sys.platform == "darwin":
          # Mac OS X
!         def _plat_load_version(self, name, version, mode=None):
              if version:
                  return self.load("lib%s.%s.dylib" % (name, version), mode)
              return self.load("lib%s.dylib" % name, mode)
              
      elif os.name == "posix":
          # Posix
!         def _plat_load_version(self, name, version, mode=None):
              if version:
                  return self.load("lib%s.so.%s" % (name, version), mode)
              return self.load("lib%s.so" % name, mode)
      else:
          # Others, TBD
--- 121,147 ----
              return self.load(name, mode)
  
+         def _load(self, libname, mode):
+             return self._dlltype(libname, mode)
+ 
      elif os.name == "posix" and sys.platform == "darwin":
          # Mac OS X
!         def _plat_load_version(self, name, version, mode):
              if version:
                  return self.load("lib%s.%s.dylib" % (name, version), mode)
              return self.load("lib%s.dylib" % name, mode)
+ 
+         def _load(self, libname, mode):
+             return self._dlltype(_dyld_find(libname), mode)
              
      elif os.name == "posix":
          # Posix
!         def _plat_load_version(self, name, version, mode):
              if version:
                  return self.load("lib%s.so.%s" % (name, version), mode)
              return self.load("lib%s.so" % name, mode)
+ 
+         def _load(self, libname, mode):
+             return self._dlltype(libname, mode)
+ 
      else:
          # Others, TBD
***************
*** 139,142 ****
--- 149,155 ----
              return self.load(name, mode)
  
+         def _load(self, libname, mode):
+             return self._dlltype(libname, mode)
+ 
      def load_version(self, name, version=None, mode=None):
          """Build a (system dependend) filename from 'name' and
***************
*** 218,222 ****
          else:
              print cdll.load("libm.so")
!             print cdll.load("libcrypto.so")
  
  if __name__ == "__main__":
--- 231,236 ----
          else:
              print cdll.load("libm.so")
!             print cdll.load("libcrypt.so")
!             print cdll.find("crypt")
  
  if __name__ == "__main__":