Removed sys.path manipulation not needed for python

dtmilano · dtmilano · commit 818c4b5de968 · 2013-10-02T23:45:03.000-04:00
- Version 4.5.2
- Restores snake whitespaces
diff --git a/AndroidViewClient/tools/culebra b/AndroidViewClient/tools/culebra
@@ -7,18 +7,18 @@ Created on Mar 28, 2013
 Culebra helps you create AndroidViewClient scripts generating a working template that can be
 modified to suit more specific needs.
                       __    __    __    __
-                     /  \  /  \  /  \  /  \
+                     /  \  /  \  /  \  /  \ 
 ____________________/  __\/  __\/  __\/  __\_____________________________
 ___________________/  /__/  /__/  /__/  /________________________________
                    | / \   / \   / \   / \   \___
-                   |/   \_/   \_/   \_/   \    o \
+                   |/   \_/   \_/   \_/   \    o \ 
                                            \_____/--<
 @author: Diego Torres Milano
 @author: Jennifer E. Swofford (ascii art snake)
 
 '''
 
-__version__ = '4.2.3'
+__version__ = '4.5.2'
 
 import re
 import sys
@@ -29,14 +29,6 @@ import subprocess
 import codecs
 from datetime import date
 
-# PyDev sets PYTHONPATH, use it
-try:
-    for p in os.environ['PYTHONPATH'].split(':'):
-        if not p in sys.path:
-            sys.path.append(p)
-except:
-    pass
-
 try:
     sys.path.append(os.path.join(os.environ['ANDROID_VIEW_CLIENT_HOME'], 'src'))
 except:
@@ -90,7 +82,7 @@ OPTS_HELP = {
     'd': 'whether to use findViewWithContentDescription',
     'r': 'use regexps in matches',
     'U': 'generates unit test script',
-    'j': 'use jar and appropriate shebang to run script',
+    'j': 'use jar and appropriate shebang to run script (deprecated)',
     'D': 'use a dictionary to store the Views found',
     'K': 'dictionary keys from: id, text, content-description',
     'R': 'auto regexps (i.e. clock)',
@@ -396,11 +388,11 @@ Copyright (C) 2013  Diego Torres Milano
 Created on %s by Culebra v%s
 
                       __    __    __    __
-                     /  \  /  \  /  \  /  \
+                     /  \  /  \  /  \  /  \ 
 ____________________/  __\/  __\/  __\/  __\_____________________________
 ___________________/  /__/  /__/  /__/  /________________________________
                    | / \   / \   / \   / \   \___
-                   |/   \_/   \_/   \_/   \    o \
+                   |/   \_/   \_/   \_/   \    o \ 
                                            \_____/--<
 @author: Diego Torres Milano
 @author: Jennifer E. Swofford (ascii art snake)
@@ -414,14 +406,6 @@ import os
 
 if not options[USE_JAR]:
     print '''
-# PyDev sets PYTHONPATH, use it
-try:
-    for p in os.environ['PYTHONPATH'].split(':'):
-        if not p in sys.path:
-            sys.path.append(p)
-except:
-    pass
-
 try:
     sys.path.append(os.path.join(os.environ['ANDROID_VIEW_CLIENT_HOME'], 'src'))
 except:
@@ -466,10 +450,7 @@ if options[INTERACTIVE]:
         data = s.recv(1024)
         code = ViewClient.excerpt(data)
         exec code
-        # unfortunately, this does not work with monkeyrunner (OS X <= 22.0.1)
-        #resp = raw_input("Continue recording events? [Y/n]: ")
-        print >>sys.stderr, "Continue recording events? [Y/n]: "
-        resp = fin.readline().strip()
+        resp = raw_input("Continue recording events? [Y/n]: ")
         if resp in ['N', 'n']:
             break
     s.sendall("RECORD EVENTS STOP\n")
diff --git a/AndroidViewClient/tools/dump b/AndroidViewClient/tools/dump
@@ -6,20 +6,12 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '4.2.0'
+__version__ = '4.5.2'
 
 import sys
 import os
 import getopt
 
-# PyDev sets PYTHONPATH, use it
-try:
-    for p in os.environ['PYTHONPATH'].split(':'):
-        if not p in sys.path:
-            sys.path.append(p)
-except:
-    pass
-
 try:
     sys.path.append(os.path.join(os.environ['ANDROID_VIEW_CLIENT_HOME'], 'src'))
 except:
