pep8 cleanup

gitfiti.py

@@ -1,7 +1,12 @@
 #!/usr/bin/env python
-import datetime, math, itertools, urllib2, json
 
-title='''
+import datetime
+import math
+import itertools
+import urllib2
+import json
+
+TITLE = '''
           _ __  _____ __  _ 
    ____ _(_) /_/ __(_) /_(_)
   / __ `/ / __/ /_/ / __/ / 
@@ -10,7 +15,7 @@ title='''
 /____/ 
 '''
 
-kitty=[
+KITTY = [
 [0,0,0,4,0,0,0,0,4,0,0,0],
 [0,0,4,2,4,4,4,4,2,4,0,0],
 [0,0,4,2,2,2,2,2,2,4,0,0],
@@ -19,7 +24,7 @@ kitty=[
 [2,2,4,2,2,2,2,2,2,4,2,2],
 [0,0,0,3,4,4,4,4,3,0,0,0]]
 
-oneup=[
+ONEUP = [
 [0,4,4,4,4,4,4,4,0],
 [4,3,2,2,1,2,2,3,4],
 [4,2,2,1,1,1,2,2,4],
@@ -28,7 +33,7 @@ oneup=[
 [0,4,1,1,1,1,1,4,0],
 [0,0,4,4,4,4,4,0,0]]
 
-oneup2=[
+ONEUP2 = [
 [0,0,4,4,4,4,4,4,4,0,0],
 [0,4,2,2,1,1,1,2,2,4,0],
 [4,3,2,2,1,1,1,2,2,3,4],
@@ -37,7 +42,7 @@ oneup2=[
 [0,0,4,1,1,1,1,1,4,0,0],
 [0,0,0,4,4,4,4,4,0,0,0]]
 
-hackerschool=[
+HACKERSCHOOL = [
 [4,4,4,4,4,4],
 [4,3,3,3,3,4],
 [4,1,3,3,1,4],
@@ -46,7 +51,7 @@ hackerschool=[
 [0,0,4,4,0,0],
 [4,4,4,4,4,4]]
 
-octocat=[
+OCTOCAT = [
 [0,0,0,4,0,0,0,4,0],
 [0,0,4,4,4,4,4,4,4],
 [0,0,4,1,3,3,3,1,4],
@@ -55,7 +60,7 @@ octocat=[
 [0,0,4,4,4,4,4,4,4],
 [0,0,4,0,4,0,4,0,4]]
 
-octocat2=[
+OCTOCAT2 = [
 [0,0,4,0,0,4,0],
 [0,4,4,4,4,4,4],
 [0,4,1,3,3,1,4],
@@ -64,7 +69,7 @@ octocat2=[
 [0,4,4,4,4,4,0],
 [0,0,0,4,4,4,0]]
 
-hello=[
+HELLO = [
 [0,1,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,4],
 [0,2,0,0,0,0,0,0,0,2,0,2,0,0,0,0,0,4],
 [0,3,3,3,0,2,3,3,0,3,0,3,0,1,3,1,0,3],
@@ -73,7 +78,7 @@ hello=[
 [0,2,0,2,0,2,0,0,0,2,0,2,0,2,0,2,0,0],
 [0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,4]]
 
-hireme=[
+HIREME = [
 [1,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 [2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 [3,3,3,0,2,0,3,3,3,0,2,3,3,0,0,3,3,0,3,0,0,2,3,3],
@@ -82,7 +87,7 @@ hireme=[
 [2,0,2,0,2,0,2,0,0,0,2,0,0,0,0,2,0,2,0,2,0,2,0,0],
 [1,0,1,0,1,0,1,0,0,0,1,1,1,0,0,1,0,1,0,1,0,1,1,1]]
 
-ascii_to_number = {
+ASCII_TO_NUMBER = {
   '_': 0,
   '_': 1,
   '~': 2,
@@ -96,19 +101,16 @@ def str_to_sprite(content):
     def is_empty_line(line):
         return len(line) != 0
     lines = filter(is_empty_line, lines)
-
     # Break up lines into each character
     split_lines = map(list, lines)
-
     # Replace each character with its numeric equivalent
     for line in split_lines:
         for index, char in enumerate(line):
-      line[index] = ascii_to_number.get(char, 0)
+            line[index] = ASCII_TO_NUMBER.get(char, 0)
-
     # Return the formatted str
     return split_lines
 
-oneup_str = str_to_sprite("""
+ONEUP_STR = str_to_sprite("""
  ******* 
 *=~~-~~=*
 *~~---~~*
@@ -118,48 +120,47 @@ oneup_str = str_to_sprite("""
   *****  
 """)
 
-images={
+IMAGES = {
-'kitty':kitty,
+'kitty': KITTY,
-'oneup':oneup,
+'oneup':ONEUP,
-'oneup2':oneup2,
+'oneup2':ONEUP2,
-'hackerschool':hackerschool,
+'hackerschool':HACKERSCHOOL,
-'octocat':octocat,
+'octocat':OCTOCAT,
-'octocat2':octocat2,
+'octocat2':OCTOCAT2,
-'hello':hello,
+'hello':HELLO,
-'hireme':hireme,
+'hireme':HIREME,
-'oneup_str':oneup_str
+'oneup_str':ONEUP_STR
 }
 
-def load_images(imgNames):
+def load_images(img_names):
     """loads user images from given file(s)"""
-	if imgNames[0]=='':
+    if img_names[0] == '':
         return dict()
-	for imageName in imgNames:
+    for image_name in img_names:
-		img = open(imageName)
+        img = open(image_name)
-		loadedImgs = {}
+        loaded_imgs = {}
-		imgList = ''
+        img_list = ''
-		imgLine = ' '
+        img_line = ' '
         name = img.readline().replace('\n', '')
         name = name[1:]
 
         while True:
-			imgLine = img.readline()
+            img_line = img.readline()
-			if imgLine == '':
+            if img_line == '':
                 break
-			imgLine.replace('\n', '')
+            img_line.replace('\n', '')
-			if(imgLine[0] == ':'):
+            if(img_line[0] == ':'):
-				loadedImgs[name] = json.loads(imgList)
+                loaded_imgs[name] = json.loads(img_list)
-				name = imgLine[1:]
+                name = img_line[1:]
-				imgList = ''
+                img_list = ''
             else:
-				imgList += imgLine
+                img_list += img_line
-	loadedImgs[name] = json.loads(imgList)
+        loaded_imgs[name] = json.loads(img_list)
-	return loadedImgs
+        return loaded_imgs
 
-def get_calendar(username):
+def get_calendar(username, base_url='https://github.com/'):
     """retrieves the github commit calendar data for a username"""
-	BASEURL='https://github.com/'
+    url = base_url + 'users/' + username + '/contributions_calendar_data'
-	url = BASEURL + 'users/' + username + '/contributions_calendar_data'
     page = urllib2.urlopen(url)
     return json.load(page)
 
@@ -182,7 +183,8 @@ def multiplier(max_commits):
     return m
 
 def get_start_date():
-	'''returns a datetime object for the first sunday after one year ago today at 12:00 noon'''
+    """returns a datetime object for the first sunday after one year ago today
+    at 12:00 noon"""
     d = datetime.datetime.today()
     date = datetime.datetime(d.year-1, d.month, d.day, 12)
     weekday = datetime.datetime.weekday(date)
@@ -192,7 +194,8 @@ def get_start_date():
     return date
 
 def date_gen(start_date, offset=0):
-	'''generator that returns the next date, requires a datetime object as input. The offset is in weeks'''
+    """generator that returns the next date, requires a datetime object as
+    input. The offset is in weeks"""
     start = offset * 7
     for i in itertools.count(start):
         yield start_date + datetime.timedelta(i)
@@ -205,27 +208,34 @@ def values_in_date_order(image, multiplier=1):
             yield image[h][w]*multiplier
 
 def commit(content, commitdate):
-	template = '''echo %s >> gitfiti\nGIT_AUTHOR_DATE=%s GIT_COMMITTER_DATE=%s git commit -a -m "gitfiti"\n''' 
+    template = ("""echo {0} >> gitfiti\n"""
-	return template	% (content, commitdate.isoformat(), commitdate.isoformat())
+    """GIT_AUTHOR_DATE={1} GIT_COMMITTER_DATE={2}\n"""
+    """git commit -a -m "gitfiti" > /dev/null\n""")
+    return template.format(content, commitdate.isoformat(), 
+            commitdate.isoformat())
 
-def fake_it(image, start_date, username, repo, offset=0, multiplier=1):
+def fake_it(image, start_date, username, repo, offset=0, multiplier=1,
+        git_url='git@github.com'):
     template = ('#!/bin/bash\n'
-				'REPO=%s\n'
+        'REPO={0}\n'
         'git init $REPO\n'
         'cd $REPO\n'
         'touch README.md\n'
         'git add README.md\n'
         'touch gitfiti\n'
         'git add gitfiti\n'
-				'%s\n'
+        '{1}\n'
-				'git remote add origin git@github.com:%s/$REPO.git\n'
+        'git remote add origin {2}:{3}/$REPO.git\n'
         'git pull\n'
         'git push -u origin master\n')
     strings = []
-	for value, date in zip(values_in_date_order(image, multiplier), date_gen(start_date, offset)):
+    for value, date in zip(values_in_date_order(image, multiplier),
+            date_gen(start_date, offset)):
+        print value, date
         for i in range(value):
+            print i
             strings.append(commit(i, date))
-	return template % (repo, "".join(strings), username)
+    return template.format(repo, "".join(strings), git_url, username)
 
 def save(output, filename):
     """Saves the list to a given filename"""
@@ -234,8 +244,8 @@ def save(output, filename):
     f.close()
 
 def main():
-	global images
+    global IMAGES
-	print title
+    print TITLE
     print 'Enter your github username:'
     username = raw_input(">")
     cal = get_calendar(username)
@@ -246,36 +256,45 @@ def main():
 
     print 'Enter number of weeks to offset the image (from the left):'
     offset = raw_input(">")
-	if offset == None: offset = 0
+    if offset == None:
-	else: offset = int(offset)
+        offset = 0
+    else:
+        offset = int(offset)
 
     print ('By default gitfiti.py matches the darkest pixel to the highest\n'
            'number of commits found in your github commit/activity calendar,\n'
            '\n'
-			'Currently this is : %s commits\n'
+           'Currently this is : {0} commits\n'
            '\n'
            'Enter the word "gitfiti" to exceed your max\n'
            '(this option generates WAY more commits)\n'
-			'Any other input will cause the default matching behavior') % (max_commits(cal),)
+           'Any other input will cause the default matching behavior'
+           ).format(max_commits(cal),)
     match = raw_input(">")
-	if match == "gitfiti": match = m
+    if match == "gitfiti": 
-	else: match = 1
+        match = m
+    else: 
+        match = 1
 
     print 'enter file(s) to load images from (blank if not applicable)'
-	imgNames = raw_input(">").split(' ')
+    img_names = raw_input(">").split(' ')
-	images = dict(images, **load_images(imgNames))
+    images = dict(IMAGES, **load_images(img_names))
 
     print 'enter the image name to gitfiti'
     print 'images: ' + ", ".join(images.keys())
     image = raw_input(">")
-	if image == None: image = images['kitty']
+    if image == None:
+        image = IMAGES['kitty']
     else:
-		try: image = images[image]
+        try: 
-		except: image = images['kitty']
+            image = IMAGES[image]
+        except: 
+            image = IMAGES['kitty']
 
     output = fake_it(image, get_start_date(), username, repo, offset, m*match)
     save(output, 'gitfiti.sh')
-	print 'gitfiti.sh saved. Create a new(!) repo at: https://github.com/new and run it.'
+    print 'gitfiti.sh saved.'
+    print 'Create a new(!) repo at: https://github.com/new and run it.'
 
 if __name__ == '__main__':
     main()