From 710cd9709440f5cc753f366ac2f468dc940c7ed3 Mon Sep 17 00:00:00 2001
From: v3aqb <sgzz.cj@gmail.com>
Date: Tue, 12 Nov 2013 11:09:11 +0800
Subject: [PATCH 1/2] make pep8 linter happy

---
 shadowsocks/local.py  | 8 ++++----
 shadowsocks/server.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/shadowsocks/local.py b/shadowsocks/local.py
index 0731fc8..fd3d618 100755
--- a/shadowsocks/local.py
+++ b/shadowsocks/local.py
@@ -145,7 +145,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
 
 def main():
     global SERVER, REMOTE_PORT, PORT, KEY, METHOD, LOCAL, IPv6
-    
+
     logging.basicConfig(level=logging.DEBUG,
                         format='%(asctime)s %(levelname)-8s %(message)s',
                         datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
@@ -167,7 +167,7 @@ def main():
     METHOD = None
     LOCAL = ''
     IPv6 = False
-    
+
     config_path = utils.find_config()
     optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6')
     for key, value in optlist:
@@ -209,7 +209,7 @@ def main():
         sys.exit('config not specified, please read https://github.com/clowwindy/shadowsocks')
 
     utils.check_config(config)
-        
+
     encrypt.init_table(KEY, METHOD)
 
     try:
@@ -223,6 +223,6 @@ def main():
     except KeyboardInterrupt:
         server.shutdown()
         sys.exit(0)
-        
+
 if __name__ == '__main__':
     main()
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index c272bb8..8c6d07b 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -39,7 +39,6 @@ import socket
 import select
 import SocketServer
 import struct
-import os
 import logging
 import getopt
 import encrypt
@@ -124,13 +123,14 @@ class Socks5Server(SocketServer.StreamRequestHandler):
         except socket.error, e:
             logging.warn(e)
 
+
 def main():
     global SERVER, PORT, KEY, METHOD, IPv6
- 
+
     logging.basicConfig(level=logging.DEBUG,
                         format='%(asctime)s %(levelname)-8s %(message)s',
                         datefmt='%Y-%m-%d %H:%M:%S', filemode='a+')
-   
+
     version = ''
     try:
         import pkg_resources
@@ -142,7 +142,7 @@ def main():
     KEY = None
     METHOD = None
     IPv6 = False
- 
+
     config_path = utils.find_config()
     optlist, args = getopt.getopt(sys.argv[1:], 's:p:k:m:c:6')
     for key, value in optlist:

From b01dbb04344e88e0101b2525462deb8d3ce41a26 Mon Sep 17 00:00:00 2001
From: v3aqb <sgzz.cj@gmail.com>
Date: Tue, 12 Nov 2013 11:34:07 +0800
Subject: [PATCH 2/2] add default config when both config.json and args not
 provided

---
 shadowsocks/local.py  | 8 +++++++-
 shadowsocks/server.py | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/shadowsocks/local.py b/shadowsocks/local.py
index fd3d618..43455d9 100755
--- a/shadowsocks/local.py
+++ b/shadowsocks/local.py
@@ -179,7 +179,13 @@ def main():
         with open(config_path, 'rb') as f:
             config = json.load(f)
     else:
-        config = {}
+        config = {"server": "127.0.0.1",
+                  "server_port": 8388,
+                  "local_port": 1080,
+                  "password": "barfoo!",
+                  "timeout": 600,
+                  "method": "table"
+                  }
 
     optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6')
     for key, value in optlist:
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index 8c6d07b..4e39fae 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -154,7 +154,13 @@ def main():
             config = json.load(f)
         logging.info('loading config from %s' % config_path)
     else:
-        config = {}
+        config = {"server": "127.0.0.1",
+                  "server_port": 8388,
+                  "local_port": 1080,
+                  "password": "barfoo!",
+                  "timeout": 600,
+                  "method": "table"
+                  }
 
     optlist, args = getopt.getopt(sys.argv[1:], 's:p:k:m:c:6')
     for key, value in optlist: