[Libreoffice-commits] .: pyuno/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Dec 9 14:17:53 PST 2012


 pyuno/source/loader/pythonloader.py |    4 ++--
 pyuno/source/module/unohelper.py    |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a0f86c9c1d2ec16f87688a16a52f3e40e3e04391
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Dec 9 23:16:08 2012 +0100

    Python/pep8: fix E711 (is or is not None instead of = or !=) in pyuno module
    
    Change-Id: I8ee9abc9a31a6d7791a006ed589d83d5858de267

diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 03bf7d2..bc09725 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -134,7 +134,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
         implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
         if DEBUG:
             print ("Fetched ImplHelper as " + str(implHelper))
-        if implHelper == None:
+        if implHelper is None:
             return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
         else:
             return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager)
@@ -145,7 +145,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
 
         mod = self.getModuleFromUrl( locationUrl )
         implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
-        if implHelper == None:
+        if implHelper is None:
             return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )
         else:
             return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager )
diff --git a/pyuno/source/module/unohelper.py b/pyuno/source/module/unohelper.py
index 966080e..28c9ffd 100644
--- a/pyuno/source/module/unohelper.py
+++ b/pyuno/source/module/unohelper.py
@@ -145,19 +145,19 @@ class ImplementationHelper:
 
     def getComponentFactory( self, implementationName , regKey, smgr ):
         entry = self.impls.get( implementationName, None )
-        if entry == None:
+        if entry is None:
             raise RuntimeException( implementationName + " is unknown" , None )
         return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames )
 
     def getSupportedServiceNames( self, implementationName ):
         entry = self.impls.get( implementationName, None )
-        if entry == None:
+        if entry is None:
             raise RuntimeException( implementationName + " is unknown" , None )
         return entry.serviceNames
 
     def supportsService( self, implementationName, serviceName ):
         entry = self.impls.get( implementationName,None )
-        if entry == None:
+        if entry is None:
             raise RuntimeException( implementationName + " is unknown", None )
         return serviceName in entry.serviceNames
 
@@ -265,7 +265,7 @@ class CurrentContext(XCurrentContext, Base ):
     def getValueByName( self, name ):
         if name in self.hashMap:
             return self.hashMap[name]
-        elif self.oldContext != None:
+        elif self.oldContext is not None:
             return self.oldContext.getValueByName( name )
         else:
             return None


More information about the Libreoffice-commits mailing list