diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-04-10 17:50:12 -0300 |
|---|---|---|
| committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-04-10 17:52:08 -0300 |
| commit | ad149efe8804eb831861379747bbb63013d9750d (patch) | |
| tree | 18bc3355cf34b54d96ae7084ebdbabe99b28e1d5 /service | |
| parent | 3395e1ca4cd6fe2d3d4770257242e0dc470dc11f (diff) | |
[#927] Fix imports
with @deniscostadsc
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/resources/backup_account_resource.py | 9 | ||||
| -rw-r--r-- | service/test/unit/resources/test_backup_account_resource.py | 2 | ||||
| -rw-r--r-- | service/test/unit/test_account_recovery.py | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/service/pixelated/resources/backup_account_resource.py b/service/pixelated/resources/backup_account_resource.py index db6c5c58..ec3e9dee 100644 --- a/service/pixelated/resources/backup_account_resource.py +++ b/service/pixelated/resources/backup_account_resource.py @@ -17,16 +17,15 @@ import os import json -from xml.sax import SAXParseException - -from pixelated.resources import BaseResource from twisted.python.filepath import FilePath -from pixelated.resources import get_protected_static_folder -from pixelated.account_recovery import AccountRecovery from twisted.web.http import OK, NO_CONTENT, INTERNAL_SERVER_ERROR from twisted.web.server import NOT_DONE_YET from twisted.web.template import Element, XMLFile, renderElement +from pixelated.resources import BaseResource +from pixelated.resources import get_protected_static_folder +from pixelated.account_recovery import AccountRecovery + class BackupAccountPage(Element): loader = XMLFile(FilePath(os.path.join(get_protected_static_folder(), 'backup_account.html'))) diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py index d6999c96..220e3909 100644 --- a/service/test/unit/resources/test_backup_account_resource.py +++ b/service/test/unit/resources/test_backup_account_resource.py @@ -14,8 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -import os - from mock import MagicMock, patch from twisted.trial import unittest from twisted.web.test.requesthelper import DummyRequest diff --git a/service/test/unit/test_account_recovery.py b/service/test/unit/test_account_recovery.py index 96dbc402..08298419 100644 --- a/service/test/unit/test_account_recovery.py +++ b/service/test/unit/test_account_recovery.py @@ -19,8 +19,8 @@ from twisted.internet import defer from twisted.trial import unittest from twisted.mail import smtp -from mock import patch, Mock, MagicMock -from mockito import mock, when, any as ANY +from mock import patch, Mock +from mockito import when, any as ANY from pixelated.account_recovery import AccountRecovery |