Skip to content
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

Jump to bottom

Bump to Python 3.10 and replace bpylist #14

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump to Python 3.10 and replace bpylist #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24eb764
Bump to Python 3.10
Dismounted Nov 27, 2022
c75cb25
Replace bpylist with bpylist2
Dismounted Nov 27, 2022
c640212
Sync lock file
Dismounted Nov 27, 2022
a6f233c
Update readme
Dismounted Nov 27, 2022
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
4 changes: 2 additions & 2 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ name = "pypi"

[packages]
rncryptor = "==3.2.0"
bpylist = "==0.1.4"
bpylist2 = "==4.0.1"
click = "==6.7"
pyqrcode = "==1.2.1"
pycryptodome = "==3.9.1"

[requires]
python_version = "3.7"
python_version = "3.10"
17 changes: 12 additions & 5 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ If you find problems with the file format (in particular security related issues

## Requirements

- [Python 3.7](https://www.python.org/downloads/)
- [Python 3.10](https://www.python.org/downloads/)
- [pipenv](https://github.com/pypa/pipenv)
- An encrypted OTP Auth backup/account file

Expand Down
6 changes: 3 additions & 3 deletions decrypt_otpauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import pyqrcode

from bpylist import archiver
from bpylist.archive_types import uid
from bpylist2 import archiver
from plistlib import UID

from Crypto.Cipher import AES

Expand Down Expand Up @@ -179,7 +179,7 @@ def decode_object(self, index):
return raw_obj

class_uid = raw_obj.get('$class')
if not isinstance(class_uid, uid):
if not isinstance(class_uid, UID):
raise archiver.MissingClassUID(raw_obj)

klass = self.class_for_uid(class_uid)
Expand Down