summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-03 23:14:53 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:21 +0000
commitc2b5a617285733053f867c3fdda2179a65ccbe4c (patch)
tree87c6f41dfc7a8d51d5e47cdfd9e253e9d3fad688 /bitbake/lib
parent1fd3265374f2ecc85c7835989c01b69482e72020 (diff)
downloadpoky-c2b5a617285733053f867c3fdda2179a65ccbe4c.tar.gz
bitbake: Sync module import cleanups back from bitbake trunk
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/COW.py2
-rw-r--r--bitbake/lib/bb/fetch/__init__.py8
-rw-r--r--bitbake/lib/bb/fetch/bzr.py1
-rw-r--r--bitbake/lib/bb/fetch/cvs.py2
-rw-r--r--bitbake/lib/bb/fetch/git.py3
-rw-r--r--bitbake/lib/bb/fetch/hg.py2
-rw-r--r--bitbake/lib/bb/fetch/local.py2
-rw-r--r--bitbake/lib/bb/fetch/perforce.py3
-rw-r--r--bitbake/lib/bb/fetch/ssh.py2
-rw-r--r--bitbake/lib/bb/fetch/svn.py2
-rw-r--r--bitbake/lib/bb/fetch/wget.py2
11 files changed, 8 insertions, 21 deletions
diff --git a/bitbake/lib/bb/COW.py b/bitbake/lib/bb/COW.py
index 5db41776ec..ca206cf4b4 100644
--- a/bitbake/lib/bb/COW.py
+++ b/bitbake/lib/bb/COW.py
@@ -23,8 +23,6 @@
23# Assign a file to __warn__ to get warnings about slow operations. 23# Assign a file to __warn__ to get warnings about slow operations.
24# 24#
25 25
26from inspect import getmro
27
28import copy 26import copy
29import types 27import types
30types.ImmutableTypes = tuple([ \ 28types.ImmutableTypes = tuple([ \
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index a7fc1af0c9..2191c284e3 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -24,16 +24,11 @@ BitBake build tools.
24# 24#
25# Based on functions from the base bb module, Copyright 2003 Holger Schurig 25# Based on functions from the base bb module, Copyright 2003 Holger Schurig
26 26
27import os, re, fcntl 27import os, re
28import bb 28import bb
29from bb import data 29from bb import data
30from bb import persist_data 30from bb import persist_data
31 31
32try:
33 import cPickle as pickle
34except ImportError:
35 import pickle
36
37class FetchError(Exception): 32class FetchError(Exception):
38 """Exception raised when a download fails""" 33 """Exception raised when a download fails"""
39 34
@@ -65,7 +60,6 @@ def uri_replace(uri, uri_find, uri_replace, d):
65 result_decoded[loc] = uri_decoded[loc] 60 result_decoded[loc] = uri_decoded[loc]
66 import types 61 import types
67 if type(i) == types.StringType: 62 if type(i) == types.StringType:
68 import re
69 if (re.match(i, uri_decoded[loc])): 63 if (re.match(i, uri_decoded[loc])):
70 result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc]) 64 result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
71 if uri_find_decoded.index(i) == 2: 65 if uri_find_decoded.index(i) == 2:
diff --git a/bitbake/lib/bb/fetch/bzr.py b/bitbake/lib/bb/fetch/bzr.py
index b23e9eef86..b27fb63d07 100644
--- a/bitbake/lib/bb/fetch/bzr.py
+++ b/bitbake/lib/bb/fetch/bzr.py
@@ -29,7 +29,6 @@ import bb
29from bb import data 29from bb import data
30from bb.fetch import Fetch 30from bb.fetch import Fetch
31from bb.fetch import FetchError 31from bb.fetch import FetchError
32from bb.fetch import MissingParameterError
33from bb.fetch import runfetchcmd 32from bb.fetch import runfetchcmd
34 33
35class Bzr(Fetch): 34class Bzr(Fetch):
diff --git a/bitbake/lib/bb/fetch/cvs.py b/bitbake/lib/bb/fetch/cvs.py
index aa55ad8bf6..d8bd4eaf75 100644
--- a/bitbake/lib/bb/fetch/cvs.py
+++ b/bitbake/lib/bb/fetch/cvs.py
@@ -26,7 +26,7 @@ BitBake build tools.
26#Based on functions from the base bb module, Copyright 2003 Holger Schurig 26#Based on functions from the base bb module, Copyright 2003 Holger Schurig
27# 27#
28 28
29import os, re 29import os
30import bb 30import bb
31from bb import data 31from bb import data
32from bb.fetch import Fetch 32from bb.fetch import Fetch
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index 54dafec51b..c811937743 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -20,11 +20,10 @@ BitBake 'Fetch' git implementation
20# with this program; if not, write to the Free Software Foundation, Inc., 20# with this program; if not, write to the Free Software Foundation, Inc.,
21# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 21# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
22 22
23import os, re 23import os
24import bb 24import bb
25from bb import data 25from bb import data
26from bb.fetch import Fetch 26from bb.fetch import Fetch
27from bb.fetch import FetchError
28from bb.fetch import runfetchcmd 27from bb.fetch import runfetchcmd
29 28
30class Git(Fetch): 29class Git(Fetch):
diff --git a/bitbake/lib/bb/fetch/hg.py b/bitbake/lib/bb/fetch/hg.py
index b5fd8fecd7..08cb61fc28 100644
--- a/bitbake/lib/bb/fetch/hg.py
+++ b/bitbake/lib/bb/fetch/hg.py
@@ -24,7 +24,7 @@ BitBake 'Fetch' implementation for mercurial DRCS (hg).
24# 24#
25# Based on functions from the base bb module, Copyright 2003 Holger Schurig 25# Based on functions from the base bb module, Copyright 2003 Holger Schurig
26 26
27import os, re 27import os
28import sys 28import sys
29import bb 29import bb
30from bb import data 30from bb import data
diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py
index 54d598ae89..577774e597 100644
--- a/bitbake/lib/bb/fetch/local.py
+++ b/bitbake/lib/bb/fetch/local.py
@@ -25,7 +25,7 @@ BitBake build tools.
25# 25#
26# Based on functions from the base bb module, Copyright 2003 Holger Schurig 26# Based on functions from the base bb module, Copyright 2003 Holger Schurig
27 27
28import os, re 28import os
29import bb 29import bb
30from bb import data 30from bb import data
31from bb.fetch import Fetch 31from bb.fetch import Fetch
diff --git a/bitbake/lib/bb/fetch/perforce.py b/bitbake/lib/bb/fetch/perforce.py
index 2fb38b4190..394f5a2253 100644
--- a/bitbake/lib/bb/fetch/perforce.py
+++ b/bitbake/lib/bb/fetch/perforce.py
@@ -25,12 +25,11 @@ BitBake build tools.
25# 25#
26# Based on functions from the base bb module, Copyright 2003 Holger Schurig 26# Based on functions from the base bb module, Copyright 2003 Holger Schurig
27 27
28import os, re 28import os
29import bb 29import bb
30from bb import data 30from bb import data
31from bb.fetch import Fetch 31from bb.fetch import Fetch
32from bb.fetch import FetchError 32from bb.fetch import FetchError
33from bb.fetch import MissingParameterError
34 33
35class Perforce(Fetch): 34class Perforce(Fetch):
36 def supports(self, url, ud, d): 35 def supports(self, url, ud, d):
diff --git a/bitbake/lib/bb/fetch/ssh.py b/bitbake/lib/bb/fetch/ssh.py
index 81a9892dcc..68e6fdb1df 100644
--- a/bitbake/lib/bb/fetch/ssh.py
+++ b/bitbake/lib/bb/fetch/ssh.py
@@ -37,11 +37,9 @@ IETF secsh internet draft:
37# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 37# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
38 38
39import re, os 39import re, os
40import bb
41from bb import data 40from bb import data
42from bb.fetch import Fetch 41from bb.fetch import Fetch
43from bb.fetch import FetchError 42from bb.fetch import FetchError
44from bb.fetch import MissingParameterError
45 43
46 44
47__pattern__ = re.compile(r''' 45__pattern__ = re.compile(r'''
diff --git a/bitbake/lib/bb/fetch/svn.py b/bitbake/lib/bb/fetch/svn.py
index aead1629b3..eef9862a84 100644
--- a/bitbake/lib/bb/fetch/svn.py
+++ b/bitbake/lib/bb/fetch/svn.py
@@ -23,7 +23,7 @@ BitBake 'Fetch' implementation for svn.
23# 23#
24# Based on functions from the base bb module, Copyright 2003 Holger Schurig 24# Based on functions from the base bb module, Copyright 2003 Holger Schurig
25 25
26import os, re 26import os
27import sys 27import sys
28import bb 28import bb
29from bb import data 29from bb import data
diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py
index d1ae6cb65f..a0dca94040 100644
--- a/bitbake/lib/bb/fetch/wget.py
+++ b/bitbake/lib/bb/fetch/wget.py
@@ -25,7 +25,7 @@ BitBake build tools.
25# 25#
26# Based on functions from the base bb module, Copyright 2003 Holger Schurig 26# Based on functions from the base bb module, Copyright 2003 Holger Schurig
27 27
28import os, re 28import os
29import bb 29import bb
30from bb import data 30from bb import data
31from bb.fetch import Fetch 31from bb.fetch import Fetch