From af1faa65314678bcf3b748b77386ec4d23b1fd4d Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Mon, 23 Jan 2017 15:53:10 -0200
Subject: [PATCH] Move teamsecrets to cli

---
 .gitignore                       | 1 +
 nizkctf/cli/team.py              | 2 +-
 nizkctf/{ => cli}/teamsecrets.py | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename nizkctf/{ => cli}/teamsecrets.py (83%)

diff --git a/.gitignore b/.gitignore
index 28d6a04..b63622b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # our own stuff
 /submissions
 /local-settings.json
+/team-secrets.json
 
 # elm-make
 /elm-stuff
diff --git a/nizkctf/cli/team.py b/nizkctf/cli/team.py
index 887e0a1..1002c1e 100644
--- a/nizkctf/cli/team.py
+++ b/nizkctf/cli/team.py
@@ -8,8 +8,8 @@
 import pysodium
 import base64
 from . import log
+from .teamsecrets import write_team_secrets
 from ..team import Team
-from ..teamsecrets import write_team_secrets
 from ..subrepo import SubRepo
 
 
diff --git a/nizkctf/teamsecrets.py b/nizkctf/cli/teamsecrets.py
similarity index 83%
rename from nizkctf/teamsecrets.py
rename to nizkctf/cli/teamsecrets.py
index fbaa749..683cdbb 100644
--- a/nizkctf/teamsecrets.py
+++ b/nizkctf/cli/teamsecrets.py
@@ -2,8 +2,8 @@
 
 from __future__ import unicode_literals
 import os
-from .serializable import SerializableDict
-from .cli import log
+from . import log
+from ..serializable import SerializableDict
 
 
 TEAMSECRETS_FILE = 'team-secrets.json'
@@ -12,7 +12,7 @@
 class DefaultTeamSecrets(SerializableDict):
     def path(self):
         thisdir = os.path.dirname(os.path.realpath(__file__))
-        return os.path.join(thisdir, '..', TEAMSECRETS_FILE)
+        return os.path.join(thisdir, '..', '..', TEAMSECRETS_FILE)
 
     @staticmethod
     def _binary_field(k):