From f507467c14fd4073e2cd98fac7bccd5cdbd785c0 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Fri, 18 Oct 2019 23:57:08 -0700 Subject: [PATCH] tweaks --- bin/codename | 7 ++----- codenamegenerator/__init__.py | 2 +- codenamegenerator/generate.py | 8 +++----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bin/codename b/bin/codename index c2ded83..646013f 100644 --- a/bin/codename +++ b/bin/codename @@ -1,9 +1,6 @@ #!/usr/bin/python -from codenamegenerator import generate_codename - -def main(): - print(generate_codename(snake_case=False)) +import codenamegenerator if __name__ == "__main__": - main() + codenamegenerator.clientry() diff --git a/codenamegenerator/__init__.py b/codenamegenerator/__init__.py index d80d078..06c1106 100644 --- a/codenamegenerator/__init__.py +++ b/codenamegenerator/__init__.py @@ -1 +1 @@ -from .generate import generate_codename, run_server +from .generate import generate_codename, run_server, clientry diff --git a/codenamegenerator/generate.py b/codenamegenerator/generate.py index 709a035..aa9ed46 100644 --- a/codenamegenerator/generate.py +++ b/codenamegenerator/generate.py @@ -8,6 +8,7 @@ import os import random import socketserver +# afaik this breaks if you install as an egg this_dir_path = os.path.dirname(os.path.realpath(__file__)) FIRST = [] @@ -26,11 +27,8 @@ def rand_firstword(): def rand_secondword(): return(random.choice(SECOND)) -def generate_codename(snake_case=False): - sep = " " - if snake_case: - sep = "_" - return(rand_firstword() + sep + rand_secondword()) +def generate_codename(): + return(rand_firstword() + " " + rand_secondword()) def clientry(): print(generate_codename())