Revision: 3220
Author: pekka.klarck
Date: Thu May 6 05:27:10 2010
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=3220
Modified:
/trunk/install.py
/trunk/robot_postinstall.py
/trunk/setup.py
=======================================
--- /trunk/install.py Thu May 6 04:58:31 2010
+++ /trunk/install.py Thu May 6 05:27:10 2010
@@ -75,14 +75,14 @@
if os.name == 'java':
runners.remove('pybot')
if os.sep == '\\':
- runners = [ r + '.bat' for r in runners]
+ runners = [r + '.bat' for r in runners]
for name in runners:
- if os.sep == '\\' and os.name != 'java':
- _remove(os.path.join(sys.prefix, 'Scripts', name))
- elif os.name == 'java':
+ if os.name == 'java':
_remove(os.path.join(sys.prefix, 'bin', name))
+ elif os.sep == '\\':
+ _remove(os.path.join(sys.prefix, 'Scripts', name))
else:
- for dirpath in ['/bin', '/usr/bin/', '/usr/local/bin' ]:
+ for dirpath in ['/bin', '/usr/bin/', '/usr/local/bin']:
_remove(os.path.join(dirpath, name))
def _remove_egg_info(instdir):
=======================================
--- /trunk/robot_postinstall.py Thu May 6 04:58:31 2010
+++ /trunk/robot_postinstall.py Thu May 6 05:27:10 2010
@@ -67,6 +67,7 @@
print "Failed to remove Jython compiled file '%s': %s"
\
% (path, str(err))
+
def _find_easy_install_dir():
"""Returns the installation directory that easy_install will actually
use.
@@ -127,21 +128,18 @@
name = os.path.splitext(os.path.basename(script))[0].capitalize()
print '%s script: %s' % (name, path)
-
def _read(path):
reader = open(path)
content = reader.read()
reader.close()
return content
-
def _write(path, content):
os.chmod(path, 0755)
writer = open(path, 'w')
writer.write(content)
writer.close()
-
def _find_jython():
"""Tries to find path to Jython and returns it and how it was found.
=======================================
--- /trunk/setup.py Thu May 6 04:58:31 2010
+++ /trunk/setup.py Thu May 6 05:27:10 2010
@@ -33,7 +33,6 @@
create new keywords from existing ones using the same simple syntax
that is used for creating test cases.
"""[1:-1]
-
CLASSIFIERS = """
Development Status :: 5 - Production/Stable
License :: OSI Approved :: Apache Software License
@@ -41,11 +40,9 @@
Programming Language :: Python
Topic :: Software Development :: Testing
"""[1:-1]
-
-PACKAGES = [ 'robot', 'robot.common', 'robot.conf', 'robot.libraries',
- 'robot.output', 'robot.parsing', 'robot.serializing',
- 'robot.running', 'robot.utils', 'robot.variables' ]
-
+PACKAGES = ['robot', 'robot.common', 'robot.conf', 'robot.libraries',
+ 'robot.output', 'robot.parsing', 'robot.serializing',
+ 'robot.running', 'robot.utils', 'robot.variables']
SCRIPT_NAMES = ['pybot', 'jybot', 'rebot']
if os.name == 'java':
SCRIPT_NAMES.remove('pybot')
