techcrunch.git

@@ -76,9 +76,9 @@ def calculate_median_mean_stddev(time_blocks):

         count = len(block)

         median = 0.0

         if count % 2:

-            median = float(block[count/2])

+            median = float(block[count//2])

         elif count > 0:

-            median = (block[count / 2 - 1] + block[count / 2]) / 2.0

+            median = (block[count // 2 - 1] + block[count // 2]) / 2.0

         # Calculate the mean and standard deviation

         if count > 0:

@@ -101,7 +101,7 @@ def process_feed(yaml_items, metric, metric_times):

         wday = time.localtime(time_posted).tm_wday

         value_times = i[metric_times]

         values = i[metric]

-        value_times_indices = [(t - time_posted) / 1800 for t in value_times]

+        value_times_indices = [(t - time_posted) // 1800 for t in value_times]

         for j in range(len(values)):

             if value_times_indices[j] > 7 or value_times_indices[j] < 0:

                 continue

@@ -119,15 +119,6 @@ even_watermark = "E0E0FF"

 odd_watermark = "D0D0F0"

-def asciiize(s):

-    try:

-        return s.encode('ascii')

-    except UnicodeEncodeError:

-        return s

-    except exceptions.AttributeError:

-        return s

-

-

 def send_email(subject, message, toaddrs,

         fromaddr='"%s" <%s>' % (os.path.basename(__file__), smtp_creds.user)):

     """ Sends Email """

@@ -252,8 +243,6 @@ def process_feed(yaml_items):

                 yaml_items.pop()

             for i in yaml_items:

-                # i['title'] = asciiize(i['title'])

-                # i['tags'] = map(asciiize, i['tags'])

                 process_yaml_item(i)

     else:

@@ -298,7 +287,7 @@ def process_item(feed_item, yaml_items):

     elif hasattr(feed_item, 'date_parsed'):

         date_parsed = feed_item.date_parsed

     else:

-        print("process_item found no timestamp for", asciiize(feed_item.link))

+        print("process_item found no timestamp for", feed_item.link)

     timecode_parsed = calendar.timegm(date_parsed)

     link = feed_item.link

@@ -319,11 +308,11 @@ def process_item(feed_item, yaml_items):

     if yaml_item is None:

         author = ''

         if hasattr(feed_item, 'author'):

-            author = asciiize(feed_item.author)

+            author = feed_item.author

         # Make a new yaml_item

-        yaml_item = {'title'               : asciiize(feed_item.title),

-                     'link'                : asciiize(link),

+        yaml_item = {'title'               : feed_item.title,

+                     'link'                : link,

                      'author'              : author,

                      'tags'                : [],

                      'orig_posted'         : timecode_parsed,

@@ -337,7 +326,7 @@ def process_item(feed_item, yaml_items):

                     }

         if hasattr(feed_item, 'tags'):

             for i in feed_item.tags:

-                yaml_item['tags'].append(asciiize(i.term))

+                yaml_item['tags'].append(i.term)

         yaml_items.insert(0, yaml_item)

         any_entry_added = True

@@ -393,8 +382,6 @@ def Get_fb_stats(url_string):

     comments = -1

     likes = -1

-    url_string = url_string.encode('utf-8')

-

     try:

         encoded = urllib.parse.urlencode({'access_token': facebook_token})

         url = 'https://graph.facebook.com/v2.11/?id=%s&fields=engagement&%s'

@@ -473,9 +460,9 @@ def make_index_html(yaml_items, weekend_stats, weekday_stats):

             f.write('<tr valign="center" class="%s">\n  <td><strong><a href="%s">%s</a></strong> <span class="date">at %s</span> <span class="author">by %s</span></td>\n' % \

                      (image_index % 2 and "even" or "odd",

                       image['link'],

-                      image['title'].encode('ascii', 'xmlcharrefreplace'),

-                      time.strftime("%H:%M", time.localtime(image['orig_posted'])).encode('ascii', 'xmlcharrefreplace'),

-                      image['author'].encode('ascii', 'xmlcharrefreplace'),

+                      image['title'],

+                      time.strftime("%H:%M", time.localtime(image['orig_posted'])),

+                      image['author'],

                      )

                    )

             f.write('  <td>%s<td>\n' % (image['qualified'] != -1 and '<img src="star_30.png" width="30" height="29" />' or ''))

@@ -489,15 +476,15 @@ def make_index_html(yaml_items, weekend_stats, weekday_stats):

 def make_feed_file(yaml_items):

     """Writes the RSS feed file with the YAML items."""

-    with codecs.open(os.path.join(localdir, 'rss_feed.xml'), 'wb', 'utf-8') as f:

+    with codecs.open(os.path.join(localdir, 'rss_feed.xml'), 'w', 'utf-8') as f:

         f.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<rss version=\"2.0\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n<channel>\n<atom:link href=\"http://techcrunch.dlma.com/rss_feed.xml\" rel=\"self\" type=\"application/rss+xml\"/>\n<title>Trending at TechCrunch</title><link>http://techcrunch.dlma.com</link>")

         f.write("<pubDate>%s</pubDate><description>Automatically Generated Feed</description><language>en-us</language>\n" % (time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())))

         count = 0

         for item in yaml_items:

             now = time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(item['orig_posted']))

             if item['qualified'] != -1:

-                escaped_title = html.escape(item['title']).encode('ascii', 'xmlcharrefreplace')

-                escaped_author = html.escape(item['author']).encode('ascii', 'xmlcharrefreplace')

+                escaped_title = html.escape(item['title'])

+                escaped_author = html.escape(item['author'])

                 f.write("<item><title>%s</title><pubDate>%s</pubDate><link>%s</link><guid isPermaLink=\"false\">%s</guid><description><![CDATA[By: %s]]></description></item>\n" % \

                          (escaped_title, now, item['link'], item['link'], escaped_author))

                 count += 1

@@ -537,7 +524,7 @@ if __name__=='__main__':

         #

         yaml_fullpath = os.path.join(localdir, 'techcrunch.yaml')

         if os.path.exists(yaml_fullpath):

-            with open(yaml_fullpath, 'rb') as f:

+            with open(yaml_fullpath, 'r') as f:

                 items = yaml.load(f, Loader=yaml.Loader)

                 if items is None:

                     print(yaml_fullpath, "exists, but was empty.")

@@ -545,6 +532,7 @@ if __name__=='__main__':

                 # Do any dictionary item updating that might be necessary

 #                for item in items:

+#                    item['link'] = str(item['link'])

 #                    if not item.has_key('fb_shares'):

 #                        item['fb_shares'] = []

         else:

@@ -600,7 +588,7 @@ if __name__=='__main__':

             # For the one file we really use, write to a file on the side, then move it.

             yaml_newfile_fullpath = os.path.join(localdir, 'techcrunch_temp_writable.yaml')

-            with open(yaml_newfile_fullpath, 'wb') as f:

+            with open(yaml_newfile_fullpath, 'w') as f:

                 yaml.dump(items, f, default_flow_style=None, width=120)

             try:

                 os.rename(yaml_newfile_fullpath, yaml_fullpath)