Skip to content

support unicode input on Python 2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
minrk wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

support unicode input on Python 2 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions simplepam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
from ctypes.util import find_library
import sys

if sys.version_info >= (3,):
unicode = str

libpam = CDLL(find_library("pam"))
libc = CDLL(find_library("c"))

Expand Down Expand Up @@ -124,13 +127,12 @@ def authenticate(username, password, service='login', encoding='utf-8',
Defaults to 'True'.
"""

if sys.version_info >= (3,):
if isinstance(username, str):
username = username.encode(encoding)
if isinstance(password, str):
password = password.encode(encoding)
if isinstance(service, str):
service = service.encode(encoding)
if isinstance(username, unicode):
username = username.encode(encoding)
if isinstance(password, unicode):
password = password.encode(encoding)
if isinstance(service, unicode):
service = service.encode(encoding)

@conv_func
def my_conv(n_messages, messages, p_response, app_data):
Expand Down