Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1047)

Unified Diff: dfvfs/lib/fvde.py

Issue 328040044: [dfvfs] Made Unicode strings the default #204 and updated docstrings #182 (Closed)
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dfvfs/lib/ewf.py ('k') | dfvfs/lib/glob2regex.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dfvfs/lib/fvde.py
diff --git a/dfvfs/lib/fvde.py b/dfvfs/lib/fvde.py
index b42d2e783b6a9b122ca9eced69c4899295ceef8c..40432f8d10cafe72924937621d5bef9f42fd991f 100644
--- a/dfvfs/lib/fvde.py
+++ b/dfvfs/lib/fvde.py
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
"""Helper function for FileVault Drive Encryption (FVDE) support."""
+from __future__ import unicode_literals
+
def FVDEVolumeOpen(fvde_volume, path_spec, file_object, key_chain):
"""Opens the FVDE volume using the path specification.
@@ -12,15 +14,15 @@ def FVDEVolumeOpen(fvde_volume, path_spec, file_object, key_chain):
key_chain (KeyChain): key chain.
"""
encrypted_root_plist = key_chain.GetCredential(
- path_spec, u'encrypted_root_plist')
+ path_spec, 'encrypted_root_plist')
if encrypted_root_plist:
fvde_volume.read_encrypted_root_plist(encrypted_root_plist)
- password = key_chain.GetCredential(path_spec, u'password')
+ password = key_chain.GetCredential(path_spec, 'password')
if password:
fvde_volume.set_password(password)
- recovery_password = key_chain.GetCredential(path_spec, u'recovery_password')
+ recovery_password = key_chain.GetCredential(path_spec, 'recovery_password')
if recovery_password:
fvde_volume.set_recovery_password(recovery_password)
« no previous file with comments | « dfvfs/lib/ewf.py ('k') | dfvfs/lib/glob2regex.py » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b