Unify string

lingr.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
 import simplejson
 import urllib
 import urllib2
@@ -9,7 +8,7 @@
 class Lingr(object):
 
     __URL_BASE__ = 'http://lingr.com/api/'
-    __URL_BASE_OBSERVE__ = "http://lingr.com:8080/api/"
+    __URL_BASE_OBSERVE__ = 'http://lingr.com:8080/api/'
 
     def __init__(self, user, password):
         self.user = user
@@ -27,7 +26,7 @@ def create_session(self):
         return data
 
     def get_rooms(self):
-        data = self.get("user/get_rooms", {
+        data = self.get('user/get_rooms', {
             'session': self.session
         })
         if data:
@@ -37,7 +36,7 @@ def get_rooms(self):
     def subscribe(self, room=None, reset='true'):
         if not room:
             room = ','.join(self.rooms)
-        data = self.post("room/subscribe", {
+        data = self.post('room/subscribe', {
             'session': self.session,
             'room': room,
             'reset': reset
@@ -47,7 +46,7 @@ def subscribe(self, room=None, reset='true'):
         return data
 
     def observe(self):
-        data = self.get("event/observe", {
+        data = self.get('event/observe', {
             'session': self.session,
             'counter': self.counter
         })
@@ -105,53 +104,3 @@ def stream(self):
             if 'events' in obj:
                 for event in obj['events']:
                     yield event
-
-# こっから Ubuntu 用の実装
-import os
-import pynotify
-from pit import Pit
-
-
-def get_img(url):
-    BASE_DIR = os.path.expanduser('~/.lingr')
-    if not os.path.exists(BASE_DIR):
-        os.mkdir(BASE_DIR)
-        os.chmod(BASE_DIR, 0700)
-    path = os.path.join(BASE_DIR, os.path.basename(url))
-    if os.path.exists(path):
-        return path
-    file = open(path, 'wb')
-    file.write(urllib.urlopen(url).read())
-    file.close()
-    return path
-
-
-def main():
-    config = Pit.get('lingr.com', {
-        'require': {
-            'user': 'Your lingr user name',
-            'password': 'Your lingr password'
-        }
-    })
-    lingr = Lingr(config['user'], config['password'])
-
-    for event in lingr.stream():
-        pynotify.init("lingr")
-        title = None
-        text = None
-        img = None
-        if 'message' in event:
-            message = event['message']
-            title = '%s@%s' % (message['nickname'], message['room'])
-            text = message['text']
-            img = get_img(message['icon_url'])
-        elif 'presence' in event:
-            presence = event['presence']
-            title = '%s@%s' % (presence['nickname'], presence['room'])
-            text = presence['status']
-            img = get_img(presence['icon_url'])
-        n = pynotify.Notification(title, text, img)
-        n.show()
-
-if __name__ == '__main__':
-    main()

main.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import urllib
+import os
+import pynotify
+from pit import Pit
+from lingr import Lingr
+
+
+def get_img(url):
+    BASE_DIR = os.path.expanduser('~/.lingr')
+    if not os.path.exists(BASE_DIR):
+        os.mkdir(BASE_DIR)
+        os.chmod(BASE_DIR, 0700)
+    path = os.path.join(BASE_DIR, os.path.basename(url))
+    if os.path.exists(path):
+        return path
+    file = open(path, 'wb')
+    file.write(urllib.urlopen(url).read())
+    file.close()
+    return path
+
+
+def main():
+    config = Pit.get('lingr.com', {
+        'require': {
+            'user': 'Your lingr user name',
+            'password': 'Your lingr password'
+        }
+    })
+    lingr = Lingr(config['user'], config['password'])
+
+    for event in lingr.stream():
+        pynotify.init('lingr')
+        title = None
+        text = None
+        img = None
+        if 'message' in event:
+            message = event['message']
+            title = '%s@%s' % (message['nickname'], message['room'])
+            text = message['text']
+            img = get_img(message['icon_url'])
+        elif 'presence' in event:
+            presence = event['presence']
+            title = '%s@%s' % (presence['nickname'], presence['room'])
+            text = presence['status']
+            img = get_img(presence['icon_url'])
+        n = pynotify.Notification(title, text, img)
+        n.show()
+
+if __name__ == '__main__':
+    main()