diff --git a/README.md b/README.md index fb13a14..da3a545 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Check in and water your plant every 24h to keep it growing. 5 days without water ## getting started botany is designed for unix-based systems. Clone into a local directory using `$ git clone https://github.com/jifunks/botany.git`. -Run with `$ python botany.py`. +Run with `$ python3 botany.py`. *Note - botany.py must initially be run by the user who cloned/unzipped botany.py - this initalizes the shared data file permissions.* @@ -64,7 +64,7 @@ A once-weekly cron on clear_weekly_users.py should be set up to keep weekly visi ## requirements * Unix-based OS (Mac, Linux) -* Python 2.x +* Python 3.x * Recommended: 80x24 minimum terminal, fixed-width font ## credits diff --git a/botany.py b/botany.py index 6c5eb69..f4199f5 100755 --- a/botany.py +++ b/botany.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 from __future__ import division import time @@ -249,7 +249,7 @@ class Plant(object): else: with open(visitor_filepath, mode='w') as f: json.dump([], f) - os.chmod(visitor_filepath, 0666) + os.chmod(visitor_filepath, 0o666) if not guest_timestamps: return self.watered_timestamp all_timestamps = [self.watered_timestamp] + guest_timestamps @@ -470,7 +470,7 @@ class DataManager(object): sqlite_dir_path = os.path.join(self.game_dir,'sqlite') if not os.path.exists(sqlite_dir_path): os.makedirs(sqlite_dir_path) - os.chmod(sqlite_dir_path, 0777) + os.chmod(sqlite_dir_path, 0o777) conn = sqlite3.connect(self.garden_db_path) init_table_string = """CREATE TABLE IF NOT EXISTS garden ( plant_id tinytext PRIMARY KEY, @@ -487,9 +487,9 @@ class DataManager(object): # init only, creates and sets permissions for garden db and json if os.stat(self.garden_db_path).st_uid == os.getuid(): - os.chmod(self.garden_db_path, 0666) + os.chmod(self.garden_db_path, 0o666) open(self.garden_json_path, 'a').close() - os.chmod(self.garden_json_path, 0666) + os.chmod(self.garden_json_path, 0o666) def migrate_database(self): conn = sqlite3.connect(self.garden_db_path) diff --git a/clear_weekly_users.py b/clear_weekly_users.py index b598309..2e4308b 100644 --- a/clear_weekly_users.py +++ b/clear_weekly_users.py @@ -6,6 +6,6 @@ garden_db_path = os.path.join(game_dir, 'sqlite/garden_db.sqlite') conn = sqlite3.connect(garden_db_path) c = conn.cursor() c.execute("DELETE FROM visitors") -print "Cleared weekly users" +print("Cleared weekly users") conn.commit() conn.close() diff --git a/testsql.py b/testsql.py index 7692ced..6080d42 100644 --- a/testsql.py +++ b/testsql.py @@ -40,10 +40,10 @@ def update_garden_db(): # ) # """.format(pid = "asdfasdf", pown = "jake", pdes = "big cool plant", page="25d", psco = str(25), pdead = str(False)) - print c.execute(update_query) + print(c.execute(update_query)) conn.commit() conn.close() - #print "bigggg booom" + #print("bigggg booom") def retrieve_garden_from_db(garden_db_path): # Builds a dict of dicts from garden sqlite db @@ -68,7 +68,7 @@ def retrieve_garden_from_db(garden_db_path): #init_database() #update_garden_db() results = retrieve_garden_from_db(garden_db_path) -print results +print(results) # con = sqlite3.connect(garden_db_path) # @@ -77,7 +77,7 @@ print results # cur.execute("select * from garden ORDER BY score desc") # # blah = cur.fetchall() # # con.close() -# print blah +# print(blah)