Move teamsecrets to cli

pwn2winctf · Jan 23, 2017 · af1faa6 · af1faa6
1 parent 4457faa
commit af1faa6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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 → nizkctf/cli/teamsecrets.py b/nizkctf/teamsecrets.py → 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):