t push origin masterMerge branch 'stormyjet-patch-1'

Adds support for python3
This commit is contained in:
Eric Romano
2014-08-19 00:08:16 -04:00

View File

@ -264,10 +264,10 @@ def save(output, filename):
f.close() f.close()
def main(): def main():
print TITLE print (TITLE)
print "Enter github url" print ("Enter github url")
ghe = raw_input("Enter nothing for https://github.com/ to be used: ") ghe = raw_input("Enter nothing for https://github.com/ to be used: ")
print 'Enter your github username:' print ('Enter your github username:')
username = raw_input(">") username = raw_input(">")
if ghe is None or ghe == "": if ghe is None or ghe == "":
git_base = "https://github.com/" git_base = "https://github.com/"
@ -277,10 +277,10 @@ def main():
git_base = ghe git_base = ghe
m = multiplier(max_commits(cal)) m = multiplier(max_commits(cal))
print 'Enter name of the repo to be used by gitfiti:' print ('Enter name of the repo to be used by gitfiti:')
repo = raw_input(">") repo = raw_input(">")
print 'Enter number of weeks to offset the image (from the left):' print ('Enter number of weeks to offset the image (from the left):')
offset = raw_input(">") offset = raw_input(">")
if offset == None: if offset == None:
offset = 0 offset = 0
@ -302,12 +302,12 @@ def main():
else: else:
match = 1 match = 1
print 'enter file(s) to load images from (blank if not applicable)' print ('enter file(s) to load images from (blank if not applicable)')
img_names = raw_input(">").split(' ') img_names = raw_input(">").split(' ')
images = dict(IMAGES, **load_images(img_names)) images = dict(IMAGES, **load_images(img_names))
print 'enter the image name to gitfiti' print ('enter the image name to gitfiti')
print 'images: ' + ", ".join(images.keys()) print ('images: ' + ", ".join(images.keys()))
image = raw_input(">") image = raw_input(">")
if image == None: if image == None:
image = IMAGES['kitty'] image = IMAGES['kitty']
@ -325,8 +325,9 @@ def main():
m*match,git_url=git_url) m*match,git_url=git_url)
save(output, 'gitfiti.sh') save(output, 'gitfiti.sh')
print 'gitfiti.sh saved.' print ('gitfiti.sh saved.')
print 'Create a new(!) repo at: {0}new and run it.'.format(git_base) print ('Create a new(!) repo at: {0}new and run it.' , format(git_base))
pause
if __name__ == '__main__': if __name__ == '__main__':
main() main()