forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed == / != None

Browse Source
This commit is contained in:
Rhet Turnbull
2019-11-23 13:27:54 -08:00
parent 1c323338c6
commit 986a092130
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osxphotos/__init__.py
View File

@@ -46,7 +46,7 @@ _PHOTOS_5_VERSION = "6000"
_TESTED_OS_VERSIONS = ["12", "13", "14", "15"] _TESTED_OS_VERSIONS = ["12", "13", "14", "15"]
# set _debug = True to enable debug output # set _debug = True to enable debug output
_debug = False _debug = False
logging.basicConfig( logging.basicConfig(
level=logging.DEBUG, level=logging.DEBUG,
format="%(asctime)s - %(levelname)s - %(filename)s - %(lineno)d - %(message)s", format="%(asctime)s - %(levelname)s - %(filename)s - %(lineno)d - %(message)s",
@@ -294,7 +294,7 @@ class PhotosDB:
# this is a serialized CFData object # this is a serialized CFData object
photosurlref = pl["IPXDefaultLibraryURLBookmark"] photosurlref = pl["IPXDefaultLibraryURLBookmark"]
if photosurlref != None: if photosurlref is not None:
# use CFURLCreateByResolvingBookmarkData to de-serialize bookmark data into a CFURLRef # use CFURLCreateByResolvingBookmarkData to de-serialize bookmark data into a CFURLRef
photosurl = CoreFoundation.CFURLCreateByResolvingBookmarkData( photosurl = CoreFoundation.CFURLCreateByResolvingBookmarkData(
kCFAllocatorDefault, photosurlref, 0, None, None, None, None kCFAllocatorDefault, photosurlref, 0, None, None, None, None
@@ -425,7 +425,7 @@ class PhotosDB:
+ "RKVersion.filename not like '%.pdf' and RKVersion.isInTrash = 0" + "RKVersion.filename not like '%.pdf' and RKVersion.isInTrash = 0"
) )
for person in c: for person in c:
if person[0] == None: if person[0] is None:
# logger.debug(f"skipping person = None {person[1]}") # logger.debug(f"skipping person = None {person[1]}")
continue continue
if not person[1] in self._dbfaces_uuid: if not person[1] in self._dbfaces_uuid:
@@ -683,7 +683,7 @@ class PhotosDB:
"AND ZGENERICASSET.ZTRASHEDSTATE = 0 AND ZGENERICASSET.ZKIND = 0 " "AND ZGENERICASSET.ZTRASHEDSTATE = 0 AND ZGENERICASSET.ZKIND = 0 "
) )
for person in c: for person in c:
if person[0] == None: if person[0] is None:
# logger.debug(f"skipping person = None {person[1]}") # logger.debug(f"skipping person = None {person[1]}")
continue continue
if not person[1] in self._dbfaces_uuid: if not person[1] in self._dbfaces_uuid: