Skip to content

Commit

Permalink
Correct spelling mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwardBetts authored and roddhjav committed May 20, 2024
1 parent a0cbaaf commit 064a8ab
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The format is based on [Keep a Changelog].
- Support for python 3.10, dropped support for python 3.6
- Remove Travis CI in favor of Github Action.
- The man pages are now generated from markdown with pandoc.
- Various refractor, style and linter improvments.
- Various refactor, style and linter improvements.

### Fixed

Expand Down Expand Up @@ -135,7 +135,7 @@ targeted password manager.
- pass-import can file encrypted by one of the supported algo before to import it.
- pass import is now available in three way:
* As a `pass` extension `pass import`
* As an independant command line program: `pimport`
* As an independent command line program: `pimport`
* As a python library `pass_import`

- Added support for the following password managers:
Expand All @@ -153,7 +153,7 @@ targeted password manager.
- Added pip packaging.

### Changed
- The command line interface changed completly. See `pass import -h`
- The command line interface changed completely. See `pass import -h`
- The old password manager name are not valid anymore
- Removed old bash tests
- Dropped support for python 3.4 & python 3.5
Expand All @@ -172,7 +172,7 @@ targeted password manager.

### Added
- Added support for generic OTP entry import
- Added support for binary attachements for manager that support it. [#63](https://github.com/roddhjav/pass-import/issues/63)
- Added support for binary attachments for manager that support it. [#63](https://github.com/roddhjav/pass-import/issues/63)
- Added support for the 10 following password managers: [#84](https://github.com/roddhjav/pass-import/pull/84)
* passpie
* keeper
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ DESTDIR ?= /

all:
@python3 setup.py build
@echo "pass-import was built successfully. You can now install it wit \"make install\""
@echo "pass-import was built successfully. You can now install it with \"make install\""

install:
@python3 setup.py install --root="${DESTDIR}" --optimize=1 --skip-build
@echo "pass-import is installed succesfully"
@echo "pass-import is installed successfully"

local:
@python3 setup.py install --user --optimize=1
@echo "pass-import is localy installed succesfully."
@echo "pass-import is locally installed successfully."
@echo "Remember to set PASSWORD_STORE_ENABLE_EXTENSIONS to 'true' for the extension to be enabled."

tests:
Expand Down
2 changes: 1 addition & 1 deletion pass_import/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def matrix(self, cap=Cap.IMPORT) -> Dict[str, List[Callable]]:
"""Return a dict of ordered managers classes and formats.
:return dict matrix:
{ name: [pm_1, pm_2, ..., pm_n] } such as pm1 is the dedault pm and
{ name: [pm_1, pm_2, ..., pm_n] } such as pm1 is the default pm and
the other pm are ordered by they format.
"""
umatrix = defaultdict(list) # unordered matrix
Expand Down
2 changes: 1 addition & 1 deletion pass_import/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def pass_import(conf, cls_import):
importer.parse()
if not importer.secure: # pragma: no cover
conf.warning(f"The password manager {conf['importer']} has "
"been flagged as unsecure, you should update all "
"been flagged as insecure, you should update all "
"your newly imported credentials.")
return importer.data

Expand Down
2 changes: 1 addition & 1 deletion pass_import/audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def password(self):
self.breached.append((entry.get('password', ''), count))

def zxcvbn(self):
"""Password strength estimaton usuing Dropbox' zxcvbn."""
"""Password strength estimation using Dropbox' zxcvbn."""
for entry in self.data:
if entry.get('password', '') == '':
continue
Expand Down
2 changes: 1 addition & 1 deletion pass_import/detecter.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ def checkheader(self, header: List, only: bool = False) -> bool:
@classmethod
@abstractmethod
def header(cls):
"""Commom interface to get format header."""
"""Common interface to get format header."""
4 changes: 2 additions & 2 deletions pass_import/managers/lastpass.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class LastpassCLI(CLI):
.. code-block:: yml
lastpass:
login: <your email addresss>
login: <your email address>
"""
name = 'lastpass'
Expand Down Expand Up @@ -59,7 +59,7 @@ def __init__(self, prefix=None, settings=None):
self._setenv('LPASS_CLIPBOARD_COMMAND')

def _path(self, path, rep=os.sep):
r"""Lpass is not consitent with / and '\\'. Replace them by os.sep."""
r"""Lpass is not consistent with / and '\\'. Replace them by os.sep."""
return path.replace('/', rep).replace(self.sep, rep)

def sync(self):
Expand Down
14 changes: 7 additions & 7 deletions share/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def genrow(self):

@property
def format(self):
"""Get format formated."""
"""Get format formatted."""
res = ''
if self.pm.format != '':
if self.man:
Expand All @@ -81,20 +81,20 @@ def format(self):

@property
def version(self):
"""Get version formated."""
"""Get version formatted."""
res = ''
if self.pm.version != '':
res = f' v{self.pm.version}'
return res

@property
def url(self):
"""Get url formated."""
"""Get url formatted."""
return self.pm.url

@property
def hexport(self):
"""Get export help formated."""
"""Get export help formatted."""
res = ''
if self.markdown:
res = self.urlto_markdown(self.pm.hexport)
Expand All @@ -108,23 +108,23 @@ def hexport(self):

@property
def himport(self):
"""Get import help formated."""
"""Get import help formatted."""
res = self.pm.himport
if res == '':
res = f"{self.prog} {self.pm.name} file.{self.pm.format}"
return res

@property
def usage(self):
"""Get usage formated."""
"""Get usage formatted."""
res = self.pm.usage()
if res != '':
res = f'{res}\n\n'
return res

@property
def description(self):
"""Get description formated."""
"""Get description formatted."""
return self.pm.description()


Expand Down
2 changes: 1 addition & 1 deletion tests/exports/test_lastpass.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def test_lastpass_insert(self, command):

@tests.skipIfNo('lastpass')
class TestExportLastpassAPI(tests.Test):
"""Test for Lastpass with API connexion."""
"""Test for Lastpass with API connection."""

def setUp(self):
self._credentials('lastpass')
Expand Down

0 comments on commit 064a8ab

Please sign in to comment.