Combined smpt_account.py + meetup_api_key into private_settings.py

estebistec · estebistec · commit a43ffef70466 · 2011-09-05T18:59:01.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .gondor
 *.pyc
 pythonkc_site/pythonkc.sqlite
-pythonkc_site/meetup_api_key.py
 pythonkc_site/local_settings.py
-pythonkc_site/smtp_account.py
+pythonkc_site/private_settings.py
diff --git a/pythonkc_site/settings.py b/pythonkc_site/settings.py
@@ -176,9 +176,7 @@
     }
 
 
-from meetup_api_key import MEETUP_API_KEY
-
 try:
-    from smtp_account import *
+    from private_settings import *
 except ImportError:
     pass

Original file line number	Diff line number	Diff line change
`@@ -176,9 +176,7 @@`
`176`	`176`	`}`
`177`	`177`
`178`	`178`
`179`		`-from meetup_api_key import MEETUP_API_KEY`
`180`		`-`
`181`	`179`	`try:`
`182`		`- from smtp_account import *`
	`180`	`+ from private_settings import *`
`183`	`181`	`except ImportError:`
`184`	`182`	`pass`