You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2012/12/20 06:01:26 UTC
svn commit: r1424326 - in /libcloud/trunk: example_compute.py
example_loadbalancer.py libcloud/__init__.py libcloud/httplib_ssl.py
libcloud/security.py setup.py
Author: tomaz
Date: Thu Dec 20 05:01:25 2012
New Revision: 1424326
URL: http://svn.apache.org/viewvc?rev=1424326&view=rev
Log:
PEP8 fixes. No functional changes.
Contributed by DaeMyung Kang, part of LIBCLOUD-268.
--This line, and those below, wll be ignored--
M example_compute.py
M example_loadbalancer.py
M libcloud/__init__.py
M libcloud/httplib_ssl.py
M libcloud/security.py
M setup.py
Modified:
libcloud/trunk/example_compute.py
libcloud/trunk/example_loadbalancer.py
libcloud/trunk/libcloud/__init__.py
libcloud/trunk/libcloud/httplib_ssl.py
libcloud/trunk/libcloud/security.py
libcloud/trunk/setup.py
Modified: libcloud/trunk/example_compute.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/example_compute.py?rev=1424326&r1=1424325&r2=1424326&view=diff
==============================================================================
--- libcloud/trunk/example_compute.py (original)
+++ libcloud/trunk/example_compute.py Thu Dec 20 05:01:25 2012
@@ -21,8 +21,8 @@ Slicehost = get_driver(Provider.SLICEHOS
Rackspace = get_driver(Provider.RACKSPACE)
drivers = [EC2('access key id', 'secret key'),
- Slicehost('api key'),
- Rackspace('username', 'api key')]
+ Slicehost('api key'),
+ Rackspace('username', 'api key')]
nodes = [driver.list_nodes() for driver in drivers]
Modified: libcloud/trunk/example_loadbalancer.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/example_loadbalancer.py?rev=1424326&r1=1424325&r2=1424326&view=diff
==============================================================================
--- libcloud/trunk/example_loadbalancer.py (original)
+++ libcloud/trunk/example_loadbalancer.py Thu Dec 20 05:01:25 2012
@@ -36,13 +36,13 @@ def main():
# nodes: 192.168.86.1:80 and 192.168.86.2:8080. Balancer
# itself listens on port 80/tcp
new_balancer_name = 'testlb' + os.urandom(4).encode('hex')
+ members = (Member(None, '192.168.86.1', 80),
+ Member(None, '192.168.86.2', 8080))
new_balancer = driver.create_balancer(name=new_balancer_name,
- algorithm=Algorithm.ROUND_ROBIN,
- port=80,
- protocol='http',
- members=(Member(None, '192.168.86.1', 80),
- Member(None, '192.168.86.2', 8080))
- )
+ algorithm=Algorithm.ROUND_ROBIN,
+ port=80,
+ protocol='http',
+ members)
print(new_balancer)
Modified: libcloud/trunk/libcloud/__init__.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/__init__.py?rev=1424326&r1=1424325&r2=1424326&view=diff
==============================================================================
--- libcloud/trunk/libcloud/__init__.py (original)
+++ libcloud/trunk/libcloud/__init__.py Thu Dec 20 05:01:25 2012
@@ -37,12 +37,12 @@ def enable_debug(fo):
@type fo: File like object, only write operations are used.
"""
from libcloud.common.base import (Connection,
- LoggingHTTPConnection,
- LoggingHTTPSConnection)
+ LoggingHTTPConnection,
+ LoggingHTTPSConnection)
LoggingHTTPSConnection.log = fo
LoggingHTTPConnection.log = fo
Connection.conn_classes = (LoggingHTTPConnection,
- LoggingHTTPSConnection)
+ LoggingHTTPSConnection)
def _init_once():
Modified: libcloud/trunk/libcloud/httplib_ssl.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/httplib_ssl.py?rev=1424326&r1=1424325&r2=1424326&view=diff
==============================================================================
--- libcloud/trunk/libcloud/httplib_ssl.py (original)
+++ libcloud/trunk/libcloud/httplib_ssl.py Thu Dec 20 05:01:25 2012
@@ -123,7 +123,7 @@ class LibcloudHTTPSConnection(httplib.HT
# replace . with literal .
# http://www.dns.net/dnsrd/trick.html#legal-hostnames
valid_patterns = [
- re.compile('^' + pattern.replace(r".", r"\.") \
+ re.compile('^' + pattern.replace(r".", r"\.")
.replace(r"*", r"[0-9A-Za-z\-]+") + '$')
for pattern in (set(common_name) | set(alt_names))]
Modified: libcloud/trunk/libcloud/security.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/libcloud/security.py?rev=1424326&r1=1424325&r2=1424326&view=diff
==============================================================================
--- libcloud/trunk/libcloud/security.py (original)
+++ libcloud/trunk/libcloud/security.py Thu Dec 20 05:01:25 2012
@@ -48,9 +48,9 @@ CA_CERTS_UNAVAILABLE_WARNING_MSG = (
)
CA_CERTS_UNAVAILABLE_ERROR_MSG = (
- 'No CA Certificates were found in CA_CERTS_PATH. For information on' + \
- ' how to get required certificate files, please visit ' + \
- ' http://libcloud.apache.org/docs/ssl-certificate-validation.html'
+ 'No CA Certificates were found in CA_CERTS_PATH. For information on'
+ 'how to get required certificate files, please visit '
+ 'http://libcloud.apache.org/docs/ssl-certificate-validation.html'
)
VERIFY_SSL_DISABLED_MSG = (
Modified: libcloud/trunk/setup.py
URL: http://svn.apache.org/viewvc/libcloud/trunk/setup.py?rev=1424326&r1=1424325&r2=1424326&view=diff
==============================================================================
--- libcloud/trunk/setup.py (original)
+++ libcloud/trunk/setup.py Thu Dec 20 05:01:25 2012
@@ -40,8 +40,8 @@ TEST_PATHS = ['libcloud/test', 'libcloud
'libcloud/test/storage', 'libcloud/test/loadbalancer',
'libcloud/test/dns']
DOC_TEST_MODULES = ['libcloud.compute.drivers.dummy',
- 'libcloud.storage.drivers.dummy',
- 'libcloud.dns.drivers.dummy']
+ 'libcloud.storage.drivers.dummy',
+ 'libcloud.dns.drivers.dummy']
SUPPORTED_VERSIONS = ['2.5', '2.6', '2.7', 'PyPy', '3.x']
@@ -81,8 +81,8 @@ class TestCommand(Command):
mock
except ImportError:
print('Missing "mock" library. mock is library is needed '
- 'to run the tests. You can install it using pip: '
- 'pip install mock')
+ 'to run the tests. You can install it using pip: '
+ 'pip install mock')
sys.exit(1)
status = self._run_tests()
@@ -131,8 +131,8 @@ class TestCommand(Command):
for test_path in TEST_PATHS:
for t in glob(pjoin(self._dir, test_path, 'test_*.py')):
if (sys.version_info >= (3, 2) and sys.version_info < (3, 3) or
- sys.version_info >= (2, 5) and sys.version_info < (2, 6)) \
- and t.find('test_local'):
+ sys.version_info >= (2, 5) and sys.version_info < (2, 6)) \
+ and t.find('test_local'):
# Lockfile doesn't work with 2.5 and 3.2. Temporary disable
# local_storage test until fixes have been submitted
# upstream
@@ -166,12 +166,12 @@ class Pep8Command(Command):
pep8
except ImportError:
print ('Missing "pep8" library. You can install it using pip: '
- 'pip install pep8')
+ 'pip install pep8')
sys.exit(1)
cwd = os.getcwd()
retcode = call(('pep8 %s/libcloud/' %
- (cwd)).split(' '))
+ (cwd)).split(' '))
sys.exit(retcode)