Move testdata/ to the top level; closes #312

80 files changed, 0 insertions, 1024 deletions

diff --git a/astroid/tests/testdata/python2/data/MyPyPa-0.1.0-py2.5.egg b/astroid/tests/testdata/python2/data/MyPyPa-0.1.0-py2.5.egg
deleted file mode 100644
index f62599c7..00000000
--- a/astroid/tests/testdata/python2/data/MyPyPa-0.1.0-py2.5.egg
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/MyPyPa-0.1.0-py2.5.zip b/astroid/tests/testdata/python2/data/MyPyPa-0.1.0-py2.5.zip
deleted file mode 100644
index f62599c7..00000000
--- a/astroid/tests/testdata/python2/data/MyPyPa-0.1.0-py2.5.zip
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/SSL1/Connection1.py b/astroid/tests/testdata/python2/data/SSL1/Connection1.py
deleted file mode 100644
index 6bbb1302..00000000
--- a/astroid/tests/testdata/python2/data/SSL1/Connection1.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""M2Crypto.SSL.Connection
-
-Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved."""
-from __future__ import print_function
-RCS_id='$Id: Connection1.py,v 1.1 2005-06-13 20:55:22 syt Exp $'
-
-#Some code deleted here
-
-class Connection:
-
-    """An SSL connection."""
-
-    def __init__(self, ctx, sock=None):
-        print('init Connection')
diff --git a/astroid/tests/testdata/python2/data/SSL1/__init__.py b/astroid/tests/testdata/python2/data/SSL1/__init__.py
deleted file mode 100644
index a007b049..00000000
--- a/astroid/tests/testdata/python2/data/SSL1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from Connection1 import Connection
diff --git a/astroid/tests/testdata/python2/data/__init__.py b/astroid/tests/testdata/python2/data/__init__.py
deleted file mode 100644
index 332e2e72..00000000
--- a/astroid/tests/testdata/python2/data/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__revision__="$Id: __init__.py,v 1.1 2005-06-13 20:55:20 syt Exp $"
diff --git a/astroid/tests/testdata/python2/data/absimp/__init__.py b/astroid/tests/testdata/python2/data/absimp/__init__.py
deleted file mode 100644
index b98444df..00000000
--- a/astroid/tests/testdata/python2/data/absimp/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""a package with absolute import activated
-"""
-
-from __future__ import absolute_import
-
diff --git a/astroid/tests/testdata/python2/data/absimp/sidepackage/__init__.py b/astroid/tests/testdata/python2/data/absimp/sidepackage/__init__.py
deleted file mode 100644
index 239499a6..00000000
--- a/astroid/tests/testdata/python2/data/absimp/sidepackage/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""a side package with nothing in it
-"""
-
diff --git a/astroid/tests/testdata/python2/data/absimp/string.py b/astroid/tests/testdata/python2/data/absimp/string.py
deleted file mode 100644
index e68e7496..00000000
--- a/astroid/tests/testdata/python2/data/absimp/string.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import absolute_import, print_function
-import string
-print(string)
diff --git a/astroid/tests/testdata/python2/data/absimport.py b/astroid/tests/testdata/python2/data/absimport.py
deleted file mode 100644
index f98effa6..00000000
--- a/astroid/tests/testdata/python2/data/absimport.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import absolute_import
-import email
-from email import message
diff --git a/astroid/tests/testdata/python2/data/all.py b/astroid/tests/testdata/python2/data/all.py
deleted file mode 100644
index 23f7d2b6..00000000
--- a/astroid/tests/testdata/python2/data/all.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-name = 'a'
-_bla = 2
-other = 'o'
-class Aaa: pass
-
-def func(): print 'yo'
-
-__all__ = 'Aaa', '_bla', 'name'
diff --git a/astroid/tests/testdata/python2/data/appl/__init__.py b/astroid/tests/testdata/python2/data/appl/__init__.py
deleted file mode 100644
index d652ffd9..00000000
--- a/astroid/tests/testdata/python2/data/appl/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-Init
-"""
diff --git a/astroid/tests/testdata/python2/data/appl/myConnection.py b/astroid/tests/testdata/python2/data/appl/myConnection.py
deleted file mode 100644
index 5b24b259..00000000
--- a/astroid/tests/testdata/python2/data/appl/myConnection.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import print_function
-from data import SSL1
-class MyConnection(SSL1.Connection):
-
-    """An SSL connection."""
-
-    def __init__(self, dummy):
-        print('MyConnection init')
-
-if __name__ == '__main__':
-    myConnection = MyConnection(' ')
-    raw_input('Press Enter to continue...')
diff --git a/astroid/tests/testdata/python2/data/descriptor_crash.py b/astroid/tests/testdata/python2/data/descriptor_crash.py
deleted file mode 100644
index 11fbb4a2..00000000
--- a/astroid/tests/testdata/python2/data/descriptor_crash.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-import urllib
-
-class Page(object):
-    _urlOpen = staticmethod(urllib.urlopen)
-
-    def getPage(self, url):
-        handle = self._urlOpen(url)
-        data = handle.read()
-        handle.close()
-        return data
diff --git a/astroid/tests/testdata/python2/data/email.py b/astroid/tests/testdata/python2/data/email.py
deleted file mode 100644
index dc593564..00000000
--- a/astroid/tests/testdata/python2/data/email.py
+++ /dev/null
@@ -1 +0,0 @@
-"""fake email module to test absolute import doesn't grab this one"""
diff --git a/astroid/tests/testdata/python2/data/find_test/__init__.py b/astroid/tests/testdata/python2/data/find_test/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/find_test/__init__.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/find_test/module.py b/astroid/tests/testdata/python2/data/find_test/module.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/find_test/module.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/find_test/module2.py b/astroid/tests/testdata/python2/data/find_test/module2.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/find_test/module2.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/find_test/noendingnewline.py b/astroid/tests/testdata/python2/data/find_test/noendingnewline.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/find_test/noendingnewline.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/find_test/nonregr.py b/astroid/tests/testdata/python2/data/find_test/nonregr.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/find_test/nonregr.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/format.py b/astroid/tests/testdata/python2/data/format.py
deleted file mode 100644
index 73797061..00000000
--- a/astroid/tests/testdata/python2/data/format.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""A multiline string
-"""
-
-function('aeozrijz\
-earzer', hop)
-# XXX write test
-x = [i for i in range(5)
-     if i % 4]
-
-fonction(1,
-         2,
-         3,
-         4)
-
-def definition(a,
-               b,
-               c):
-    return a + b + c
-
-class debile(dict,
-             object):
-    pass
-
-if aaaa: pass
-else:
-    aaaa,bbbb = 1,2
-    aaaa,bbbb = bbbb,aaaa
-# XXX write test
-hop = \
-    aaaa
-
-
-__revision__.lower();
-
diff --git a/astroid/tests/testdata/python2/data/invalid_encoding.py b/astroid/tests/testdata/python2/data/invalid_encoding.py
deleted file mode 100644
index dddd208e..00000000
--- a/astroid/tests/testdata/python2/data/invalid_encoding.py
+++ /dev/null
@@ -1 +0,0 @@
-# -*- coding: lala -*-
\ No newline at end of file
diff --git a/astroid/tests/testdata/python2/data/lmfp/__init__.py b/astroid/tests/testdata/python2/data/lmfp/__init__.py
deleted file mode 100644
index 74b26b82..00000000
--- a/astroid/tests/testdata/python2/data/lmfp/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# force a "direct" python import
-from . import foo
diff --git a/astroid/tests/testdata/python2/data/lmfp/foo.py b/astroid/tests/testdata/python2/data/lmfp/foo.py
deleted file mode 100644
index 8f7de1e8..00000000
--- a/astroid/tests/testdata/python2/data/lmfp/foo.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys
-if not getattr(sys, 'bar', None):
-    sys.just_once = []
-# there used to be two numbers here because
-# of a load_module_from_path bug
-sys.just_once.append(42)
diff --git a/astroid/tests/testdata/python2/data/module.py b/astroid/tests/testdata/python2/data/module.py
deleted file mode 100644
index 118b16f9..00000000
--- a/astroid/tests/testdata/python2/data/module.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""test module for astroid
-"""
-
-__revision__ = '$Id: module.py,v 1.2 2005-11-02 11:56:54 syt Exp $'
-from astroid.tree.node_classes import Name as NameNode
-from astroid import modutils
-from astroid.utils import *
-import os.path
-MY_DICT = {}
-
-def global_access(key, val):
-    """function test"""
-    local = 1
-    MY_DICT[key] = val
-    for i in val:
-        if i:
-            del MY_DICT[i]
-            continue
-        else:
-            break
-    else:
-        return local
-
-
-class YO:
-    """hehe"""
-    a = 1
-    
-    def __init__(self):
-        try:
-            self.yo = 1
-        except ValueError, ex:
-            pass
-        except (NameError, TypeError):
-            raise XXXError()
-        except:
-            raise
-
-
-
-class YOUPI(YO):
-    class_attr = None
-    
-    def __init__(self):
-        self.member = None
-    
-    def method(self):
-        """method test"""
-        try:
-            MY_DICT = {}
-            local = None
-            autre = [a for (a, b) in MY_DICT if b]
-            if b in autre:
-                return b
-            else:
-                if a in autre:
-                    return a
-            global_access(local, val=autre)
-        finally:
-            return local
-    
-    def static_method():
-        """static method test"""
-        assert MY_DICT, '???'
-    static_method = staticmethod(static_method)
-    
-    def class_method(cls):
-        """class method test"""
-        exec a in b
-    class_method = classmethod(class_method)
-
-
-def four_args(a, b, c, d):
-    """four arguments (was nested_args)"""
-    pass
-    while 1:
-        if a:
-            break
-        a += +1
-    else:
-        b += -2
-    if c:
-        d = ((a) and (b)) or (c)
-    else:
-        c = ((a) and (b)) or (d)
-    map(lambda x, y: (y, x), a)
-redirect = four_args
-
diff --git a/astroid/tests/testdata/python2/data/module1abs/__init__.py b/astroid/tests/testdata/python2/data/module1abs/__init__.py
deleted file mode 100644
index 42949a44..00000000
--- a/astroid/tests/testdata/python2/data/module1abs/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from __future__ import absolute_import, print_function
-from . import core
-from .core import *
-print(sys.version)
diff --git a/astroid/tests/testdata/python2/data/module1abs/core.py b/astroid/tests/testdata/python2/data/module1abs/core.py
deleted file mode 100644
index de101117..00000000
--- a/astroid/tests/testdata/python2/data/module1abs/core.py
+++ /dev/null
@@ -1 +0,0 @@
-import sys
diff --git a/astroid/tests/testdata/python2/data/module2.py b/astroid/tests/testdata/python2/data/module2.py
deleted file mode 100644
index 0a1bd1ad..00000000
--- a/astroid/tests/testdata/python2/data/module2.py
+++ /dev/null
@@ -1,143 +0,0 @@
-from data.module import YO, YOUPI
-import data
-
-
-class Specialization(YOUPI, YO):
-    pass
-
-
-
-class Metaclass(type):
-    pass
-
-
-
-class Interface:
-    pass
-
-
-
-class MyIFace(Interface):
-    pass
-
-
-
-class AnotherIFace(Interface):
-    pass
-
-
-
-class MyException(Exception):
-    pass
-
-
-
-class MyError(MyException):
-    pass
-
-
-
-class AbstractClass(object):
-    
-    def to_override(self, whatever):
-        raise NotImplementedError()
-    
-    def return_something(self, param):
-        if param:
-            return 'toto'
-        return
-
-
-
-class Concrete0:
-    __implements__ = MyIFace
-
-
-
-class Concrete1:
-    __implements__ = (MyIFace, AnotherIFace)
-
-
-
-class Concrete2:
-    __implements__ = (MyIFace, AnotherIFace)
-
-
-
-class Concrete23(Concrete1):
-    pass
-
-del YO.member
-del YO
-[SYN1, SYN2] = (Concrete0, Concrete1)
-assert '1'
-b = (1) | (((2) & (3)) ^ (8))
-bb = ((1) | (two)) | (6)
-ccc = ((one) & (two)) & (three)
-dddd = ((x) ^ (o)) ^ (r)
-exec 'c = 3'
-exec 'c = 3' in {}, {}
-
-def raise_string(a=2, *args, **kwargs):
-    raise Exception, 'yo'
-    yield 'coucou'
-    yield
-a = (b) + (2)
-c = (b) * (2)
-c = (b) / (2)
-c = (b) // (2)
-c = (b) - (2)
-c = (b) % (2)
-c = (b) ** (2)
-c = (b) << (2)
-c = (b) >> (2)
-c = ~b
-c = not b
-d = [c]
-e = d[:]
-e = d[a:b:c]
-raise_string(*args, **kwargs)
-print >> stream, 'bonjour'
-print >> stream, 'salut',
-
-def make_class(any, base=data.module.YO, *args, **kwargs):
-    """check base is correctly resolved to Concrete0"""
-    
-    
-    class Aaaa(base):
-        """dynamic class"""
-        
-    
-    return Aaaa
-from os.path import abspath
-import os as myos
-
-
-class A:
-    pass
-
-
-
-class A(A):
-    pass
-
-
-def generator():
-    """A generator."""
-    yield
-
-def not_a_generator():
-    """A function that contains generator, but is not one."""
-    
-    def generator():
-        yield
-    genl = lambda : (yield)
-
-def with_metaclass(meta, *bases):
-    return meta('NewBase', bases, {})
-
-
-class NotMetaclass(with_metaclass(Metaclass)):
-    pass
-
-
diff --git a/astroid/tests/testdata/python2/data/noendingnewline.py b/astroid/tests/testdata/python2/data/noendingnewline.py
deleted file mode 100644
index e1d6e4a1..00000000
--- a/astroid/tests/testdata/python2/data/noendingnewline.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import unittest
-
-
-class TestCase(unittest.TestCase):
-
-    def setUp(self):
-        unittest.TestCase.setUp(self)
-
-
-    def tearDown(self):
-        unittest.TestCase.tearDown(self)
-
-    def testIt(self):
-        self.a = 10
-        self.xxx()
-
-
-    def xxx(self):
-        if False:
-            pass
-            print 'a'
-
-        if False:
-            pass
-            pass
-
-        if False:
-            pass
-            print 'rara'
-
-
-if __name__ == '__main__':
-    print 'test2'
-    unittest.main()
-
-
diff --git a/astroid/tests/testdata/python2/data/nonregr.py b/astroid/tests/testdata/python2/data/nonregr.py
deleted file mode 100644
index 813469fe..00000000
--- a/astroid/tests/testdata/python2/data/nonregr.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from __future__ import generators, print_function
-
-try:
-    enumerate = enumerate
-except NameError:
-
-    def enumerate(iterable):
-        """emulates the python2.3 enumerate() function"""
-        i = 0
-        for val in iterable:
-            yield i, val
-            i += 1
-
-def toto(value):
-    for k, v in value:
-        print(v.get('yo'))
-
-
-import imp
-fp, mpath, desc = imp.find_module('optparse',a)
-s_opt = imp.load_module('std_optparse', fp, mpath, desc)
-
-class OptionParser(s_opt.OptionParser):
-
-    def parse_args(self, args=None, values=None, real_optparse=False):
-        if real_optparse:
-            pass
-##          return super(OptionParser, self).parse_args()
-        else:
-            import optcomp
-            optcomp.completion(self)
-
-
-class Aaa(object):
-    """docstring"""
-    def __init__(self):
-        self.__setattr__('a','b')
-        pass
-
-    def one_public(self):
-        """docstring"""
-        pass
-
-    def another_public(self):
-        """docstring"""
-        pass
-
-class Ccc(Aaa):
-    """docstring"""
-
-    class Ddd(Aaa):
-        """docstring"""
-        pass
-
-    class Eee(Ddd):
-        """docstring"""
-        pass
diff --git a/astroid/tests/testdata/python2/data/notall.py b/astroid/tests/testdata/python2/data/notall.py
deleted file mode 100644
index 042491e0..00000000
--- a/astroid/tests/testdata/python2/data/notall.py
+++ /dev/null
@@ -1,7 +0,0 @@
-name = 'a'
-_bla = 2
-other = 'o'
-class Aaa: pass
-
-def func(): return 'yo'
-
diff --git a/astroid/tests/testdata/python2/data/notamodule/file.py b/astroid/tests/testdata/python2/data/notamodule/file.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/notamodule/file.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python2/data/package/__init__.py b/astroid/tests/testdata/python2/data/package/__init__.py
deleted file mode 100644
index 575d18b1..00000000
--- a/astroid/tests/testdata/python2/data/package/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""package's __init__ file"""
-
-
-from . import subpackage
diff --git a/astroid/tests/testdata/python2/data/package/absimport.py b/astroid/tests/testdata/python2/data/package/absimport.py
deleted file mode 100644
index 33ed117c..00000000
--- a/astroid/tests/testdata/python2/data/package/absimport.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import absolute_import, print_function
-import import_package_subpackage_module # fail
-print(import_package_subpackage_module)
-
-from . import hello as hola
-
diff --git a/astroid/tests/testdata/python2/data/package/hello.py b/astroid/tests/testdata/python2/data/package/hello.py
deleted file mode 100644
index b154c844..00000000
--- a/astroid/tests/testdata/python2/data/package/hello.py
+++ /dev/null
@@ -1,2 +0,0 @@
-"""hello module"""
-
diff --git a/astroid/tests/testdata/python2/data/package/import_package_subpackage_module.py b/astroid/tests/testdata/python2/data/package/import_package_subpackage_module.py
deleted file mode 100644
index ad442c16..00000000
--- a/astroid/tests/testdata/python2/data/package/import_package_subpackage_module.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# pylint: disable-msg=I0011,C0301,W0611
-"""I found some of my scripts trigger off an AttributeError in pylint
-0.8.1 (with common 0.12.0 and astroid 0.13.1).
-
-Traceback (most recent call last):
-  File "/usr/bin/pylint", line 4, in ?
-    lint.Run(sys.argv[1:])
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 729, in __init__
-    linter.check(args)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 412, in check
-    self.check_file(filepath, modname, checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 426, in check_file
-    astroid = self._check_file(filepath, modname, checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 450, in _check_file
-    self.check_astroid_module(astroid, checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 494, in check_astroid_module
-    self.astroid_events(astroid, [checker for checker in checkers
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 511, in astroid_events
-    self.astroid_events(child, checkers, _reversed_checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 511, in astroid_events
-    self.astroid_events(child, checkers, _reversed_checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 508, in astroid_events
-    checker.visit(astroid)
-  File "/usr/lib/python2.4/site-packages/logilab/astroid/utils.py", line 84, in visit
-    method(node)
-  File "/usr/lib/python2.4/site-packages/pylint/checkers/variables.py", line 295, in visit_import
-    self._check_module_attrs(node, module, name_parts[1:])
-  File "/usr/lib/python2.4/site-packages/pylint/checkers/variables.py", line 357, in _check_module_attrs
-    self.add_message('E0611', args=(name, module.name),
-AttributeError: Import instance has no attribute 'name'
-
-
-You can reproduce it by:
-(1) create package structure like the following:
-
-package/
-        __init__.py
-        subpackage/
-                   __init__.py
-                   module.py
-
-(2) in package/__init__.py write:
-
-import subpackage
-
-(3) run pylint with a script importing package.subpackage.module.
-"""
-__revision__ = '$Id: import_package_subpackage_module.py,v 1.1 2005-11-10 15:59:32 syt Exp $'
-import package.subpackage.module
diff --git a/astroid/tests/testdata/python2/data/package/subpackage/__init__.py b/astroid/tests/testdata/python2/data/package/subpackage/__init__.py
deleted file mode 100644
index dc4782e6..00000000
--- a/astroid/tests/testdata/python2/data/package/subpackage/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""package.subpackage"""
diff --git a/astroid/tests/testdata/python2/data/package/subpackage/module.py b/astroid/tests/testdata/python2/data/package/subpackage/module.py
deleted file mode 100644
index 4b7244ba..00000000
--- a/astroid/tests/testdata/python2/data/package/subpackage/module.py
+++ /dev/null
@@ -1 +0,0 @@
-"""package.subpackage.module"""
diff --git a/astroid/tests/testdata/python2/data/recursion.py b/astroid/tests/testdata/python2/data/recursion.py
deleted file mode 100644
index a34dad32..00000000
--- a/astroid/tests/testdata/python2/data/recursion.py
+++ /dev/null
@@ -1,3 +0,0 @@
-""" For issue #25 """

-class Base(object):

-    pass
\ No newline at end of file
diff --git a/astroid/tests/testdata/python2/data/unicode_package/__init__.py b/astroid/tests/testdata/python2/data/unicode_package/__init__.py
deleted file mode 100644
index 713e5591..00000000
--- a/astroid/tests/testdata/python2/data/unicode_package/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-x = "șțîâ"
\ No newline at end of file
diff --git a/astroid/tests/testdata/python2/data/unicode_package/core/__init__.py b/astroid/tests/testdata/python2/data/unicode_package/core/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python2/data/unicode_package/core/__init__.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/MyPyPa-0.1.0-py2.5.egg b/astroid/tests/testdata/python3/data/MyPyPa-0.1.0-py2.5.egg
deleted file mode 100644
index f62599c7..00000000
--- a/astroid/tests/testdata/python3/data/MyPyPa-0.1.0-py2.5.egg
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/MyPyPa-0.1.0-py2.5.zip b/astroid/tests/testdata/python3/data/MyPyPa-0.1.0-py2.5.zip
deleted file mode 100644
index f62599c7..00000000
--- a/astroid/tests/testdata/python3/data/MyPyPa-0.1.0-py2.5.zip
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/SSL1/Connection1.py b/astroid/tests/testdata/python3/data/SSL1/Connection1.py
deleted file mode 100644
index 7373271d..00000000
--- a/astroid/tests/testdata/python3/data/SSL1/Connection1.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""M2Crypto.SSL.Connection
-
-Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved."""
-
-RCS_id='$Id: Connection1.py,v 1.1 2005-06-13 20:55:22 syt Exp $'
-
-#Some code deleted here
-
-class Connection:
-
-    """An SSL connection."""
-
-    def __init__(self, ctx, sock=None):
-        print('init Connection')
diff --git a/astroid/tests/testdata/python3/data/SSL1/__init__.py b/astroid/tests/testdata/python3/data/SSL1/__init__.py
deleted file mode 100644
index c83ededc..00000000
--- a/astroid/tests/testdata/python3/data/SSL1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .Connection1 import Connection
diff --git a/astroid/tests/testdata/python3/data/__init__.py b/astroid/tests/testdata/python3/data/__init__.py
deleted file mode 100644
index 332e2e72..00000000
--- a/astroid/tests/testdata/python3/data/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__revision__="$Id: __init__.py,v 1.1 2005-06-13 20:55:20 syt Exp $"
diff --git a/astroid/tests/testdata/python3/data/absimp/__init__.py b/astroid/tests/testdata/python3/data/absimp/__init__.py
deleted file mode 100644
index b98444df..00000000
--- a/astroid/tests/testdata/python3/data/absimp/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""a package with absolute import activated
-"""
-
-from __future__ import absolute_import
-
diff --git a/astroid/tests/testdata/python3/data/absimp/sidepackage/__init__.py b/astroid/tests/testdata/python3/data/absimp/sidepackage/__init__.py
deleted file mode 100644
index 239499a6..00000000
--- a/astroid/tests/testdata/python3/data/absimp/sidepackage/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""a side package with nothing in it
-"""
-
diff --git a/astroid/tests/testdata/python3/data/absimp/string.py b/astroid/tests/testdata/python3/data/absimp/string.py
deleted file mode 100644
index e68e7496..00000000
--- a/astroid/tests/testdata/python3/data/absimp/string.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import absolute_import, print_function
-import string
-print(string)
diff --git a/astroid/tests/testdata/python3/data/absimport.py b/astroid/tests/testdata/python3/data/absimport.py
deleted file mode 100644
index 88f9d955..00000000
--- a/astroid/tests/testdata/python3/data/absimport.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-import email
-from email import message
diff --git a/astroid/tests/testdata/python3/data/all.py b/astroid/tests/testdata/python3/data/all.py
deleted file mode 100644
index 587765b5..00000000
--- a/astroid/tests/testdata/python3/data/all.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-name = 'a'
-_bla = 2
-other = 'o'
-class Aaa: pass
-
-def func(): print('yo')
-
-__all__ = 'Aaa', '_bla', 'name'
diff --git a/astroid/tests/testdata/python3/data/appl/__init__.py b/astroid/tests/testdata/python3/data/appl/__init__.py
deleted file mode 100644
index d652ffd9..00000000
--- a/astroid/tests/testdata/python3/data/appl/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-Init
-"""
diff --git a/astroid/tests/testdata/python3/data/appl/myConnection.py b/astroid/tests/testdata/python3/data/appl/myConnection.py
deleted file mode 100644
index 49269534..00000000
--- a/astroid/tests/testdata/python3/data/appl/myConnection.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from data import SSL1
-class MyConnection(SSL1.Connection):
-
-    """An SSL connection."""
-
-    def __init__(self, dummy):
-        print('MyConnection init')
-
-if __name__ == '__main__':
-    myConnection = MyConnection(' ')
-    input('Press Enter to continue...')
diff --git a/astroid/tests/testdata/python3/data/descriptor_crash.py b/astroid/tests/testdata/python3/data/descriptor_crash.py
deleted file mode 100644
index 11fbb4a2..00000000
--- a/astroid/tests/testdata/python3/data/descriptor_crash.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-import urllib
-
-class Page(object):
-    _urlOpen = staticmethod(urllib.urlopen)
-
-    def getPage(self, url):
-        handle = self._urlOpen(url)
-        data = handle.read()
-        handle.close()
-        return data
diff --git a/astroid/tests/testdata/python3/data/email.py b/astroid/tests/testdata/python3/data/email.py
deleted file mode 100644
index dc593564..00000000
--- a/astroid/tests/testdata/python3/data/email.py
+++ /dev/null
@@ -1 +0,0 @@
-"""fake email module to test absolute import doesn't grab this one"""
diff --git a/astroid/tests/testdata/python3/data/find_test/__init__.py b/astroid/tests/testdata/python3/data/find_test/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/find_test/__init__.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/find_test/module.py b/astroid/tests/testdata/python3/data/find_test/module.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/find_test/module.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/find_test/module2.py b/astroid/tests/testdata/python3/data/find_test/module2.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/find_test/module2.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/find_test/noendingnewline.py b/astroid/tests/testdata/python3/data/find_test/noendingnewline.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/find_test/noendingnewline.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/find_test/nonregr.py b/astroid/tests/testdata/python3/data/find_test/nonregr.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/find_test/nonregr.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/format.py b/astroid/tests/testdata/python3/data/format.py
deleted file mode 100644
index 73797061..00000000
--- a/astroid/tests/testdata/python3/data/format.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""A multiline string
-"""
-
-function('aeozrijz\
-earzer', hop)
-# XXX write test
-x = [i for i in range(5)
-     if i % 4]
-
-fonction(1,
-         2,
-         3,
-         4)
-
-def definition(a,
-               b,
-               c):
-    return a + b + c
-
-class debile(dict,
-             object):
-    pass
-
-if aaaa: pass
-else:
-    aaaa,bbbb = 1,2
-    aaaa,bbbb = bbbb,aaaa
-# XXX write test
-hop = \
-    aaaa
-
-
-__revision__.lower();
-
diff --git a/astroid/tests/testdata/python3/data/invalid_encoding.py b/astroid/tests/testdata/python3/data/invalid_encoding.py
deleted file mode 100644
index dddd208e..00000000
--- a/astroid/tests/testdata/python3/data/invalid_encoding.py
+++ /dev/null
@@ -1 +0,0 @@
-# -*- coding: lala -*-
\ No newline at end of file
diff --git a/astroid/tests/testdata/python3/data/lmfp/__init__.py b/astroid/tests/testdata/python3/data/lmfp/__init__.py
deleted file mode 100644
index 74b26b82..00000000
--- a/astroid/tests/testdata/python3/data/lmfp/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# force a "direct" python import
-from . import foo
diff --git a/astroid/tests/testdata/python3/data/lmfp/foo.py b/astroid/tests/testdata/python3/data/lmfp/foo.py
deleted file mode 100644
index 8f7de1e8..00000000
--- a/astroid/tests/testdata/python3/data/lmfp/foo.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys
-if not getattr(sys, 'bar', None):
-    sys.just_once = []
-# there used to be two numbers here because
-# of a load_module_from_path bug
-sys.just_once.append(42)
diff --git a/astroid/tests/testdata/python3/data/module.py b/astroid/tests/testdata/python3/data/module.py
deleted file mode 100644
index da4d7afb..00000000
--- a/astroid/tests/testdata/python3/data/module.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""test module for astroid
-"""
-
-__revision__ = '$Id: module.py,v 1.2 2005-11-02 11:56:54 syt Exp $'
-from astroid.tree.node_classes import Name as NameNode
-from astroid import modutils
-from astroid.utils import *
-import os.path
-MY_DICT = {}
-
-def global_access(key, val):
-    """function test"""
-    local = 1
-    MY_DICT[key] = val
-    for i in val:
-        if i:
-            del MY_DICT[i]
-            continue
-        else:
-            break
-    else:
-        return
-
-
-class YO:
-    """hehe"""
-    a = 1
-    
-    def __init__(self):
-        try:
-            self.yo = 1
-        except ValueError as ex:
-            pass
-        except (NameError, TypeError):
-            raise XXXError()
-        except:
-            raise
-
-
-
-class YOUPI(YO):
-    class_attr = None
-    
-    def __init__(self):
-        self.member = None
-    
-    def method(self):
-        """method test"""
-        try:
-            MY_DICT = {}
-            local = None
-            autre = [a for (a, b) in MY_DICT if b]
-            if b in autre:
-                return
-            else:
-                if a in autre:
-                    return 'hehe'
-            global_access(local, val=autre)
-        finally:
-            return local
-    
-    def static_method():
-        """static method test"""
-        assert MY_DICT, '???'
-    static_method = staticmethod(static_method)
-    
-    def class_method(cls):
-        """class method test"""
-        exec(a, b)
-    class_method = classmethod(class_method)
-
-
-def four_args(a, b, c, d):
-    """four arguments (was nested_args)"""
-    while 1:
-        if a:
-            break
-        a += +1
-    else:
-        b += -2
-    if c:
-        d = ((a) and (b)) or (c)
-    else:
-        c = ((a) and (b)) or (d)
-    list(map(lambda x, y: (y, x), a))
-redirect = four_args
-
diff --git a/astroid/tests/testdata/python3/data/module1abs/__init__.py b/astroid/tests/testdata/python3/data/module1abs/__init__.py
deleted file mode 100644
index f9d5b686..00000000
--- a/astroid/tests/testdata/python3/data/module1abs/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-
-from . import core
-from .core import *
-print(sys.version)
diff --git a/astroid/tests/testdata/python3/data/module1abs/core.py b/astroid/tests/testdata/python3/data/module1abs/core.py
deleted file mode 100644
index de101117..00000000
--- a/astroid/tests/testdata/python3/data/module1abs/core.py
+++ /dev/null
@@ -1 +0,0 @@
-import sys
diff --git a/astroid/tests/testdata/python3/data/module2.py b/astroid/tests/testdata/python3/data/module2.py
deleted file mode 100644
index 582ccd98..00000000
--- a/astroid/tests/testdata/python3/data/module2.py
+++ /dev/null
@@ -1,144 +0,0 @@
-from __future__ import print_function
-from data.module import YO, YOUPI
-import data
-
-
-class Specialization(YOUPI, YO):
-    pass
-
-
-
-class Metaclass(type):
-    pass
-
-
-
-class Interface:
-    pass
-
-
-
-class MyIFace(Interface):
-    pass
-
-
-
-class AnotherIFace(Interface):
-    pass
-
-
-
-class MyException(Exception):
-    pass
-
-
-
-class MyError(MyException):
-    pass
-
-
-
-class AbstractClass(object):
-    
-    def to_override(self, whatever):
-        raise NotImplementedError()
-    
-    def return_something(self, param):
-        if param:
-            return 'toto'
-        return
-
-
-
-class Concrete0:
-    __implements__ = MyIFace
-
-
-
-class Concrete1:
-    __implements__ = (MyIFace, AnotherIFace)
-
-
-
-class Concrete2:
-    __implements__ = (MyIFace, AnotherIFace)
-
-
-
-class Concrete23(Concrete1):
-    pass
-
-del YO.member
-del YO
-[SYN1, SYN2] = (Concrete0, Concrete1)
-assert repr(1)
-b = (1) | (((2) & (3)) ^ (8))
-bb = ((1) | (two)) | (6)
-ccc = ((one) & (two)) & (three)
-dddd = ((x) ^ (o)) ^ (r)
-exec('c = 3')
-exec('c = 3', {}, {})
-
-def raise_string(a=2, *args, **kwargs):
-    raise Exception('yo')
-    yield 'coucou'
-    yield
-a = (b) + (2)
-c = (b) * (2)
-c = (b) / (2)
-c = (b) // (2)
-c = (b) - (2)
-c = (b) % (2)
-c = (b) ** (2)
-c = (b) << (2)
-c = (b) >> (2)
-c = ~b
-c = not b
-d = [c]
-e = d[:]
-e = d[a:b:c]
-raise_string(*args, **kwargs)
-print('bonjour', file=stream)
-print('salut', end=' ', file=stream)
-
-def make_class(any, base=data.module.YO, *args, **kwargs):
-    """check base is correctly resolved to Concrete0"""
-    
-    
-    class Aaaa(base):
-        """dynamic class"""
-        
-    
-    return Aaaa
-from os.path import abspath
-import os as myos
-
-
-class A:
-    pass
-
-
-
-class A(A):
-    pass
-
-
-def generator():
-    """A generator."""
-    yield
-
-def not_a_generator():
-    """A function that contains generator, but is not one."""
-    
-    def generator():
-        yield
-    genl = lambda : (yield)
-
-def with_metaclass(meta, *bases):
-    return meta('NewBase', bases, {})
-
-
-class NotMetaclass(with_metaclass(Metaclass)):
-    pass
-
-
diff --git a/astroid/tests/testdata/python3/data/noendingnewline.py b/astroid/tests/testdata/python3/data/noendingnewline.py
deleted file mode 100644
index e17b92cc..00000000
--- a/astroid/tests/testdata/python3/data/noendingnewline.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import unittest
-
-
-class TestCase(unittest.TestCase):
-
-    def setUp(self):
-        unittest.TestCase.setUp(self)
-
-
-    def tearDown(self):
-        unittest.TestCase.tearDown(self)
-
-    def testIt(self):
-        self.a = 10
-        self.xxx()
-
-
-    def xxx(self):
-        if False:
-            pass
-            print('a')
-
-        if False:
-            pass
-            pass
-
-        if False:
-            pass
-            print('rara')
-
-
-if __name__ == '__main__':
-    print('test2')
-    unittest.main()
-
-
diff --git a/astroid/tests/testdata/python3/data/nonregr.py b/astroid/tests/testdata/python3/data/nonregr.py
deleted file mode 100644
index 78765c85..00000000
--- a/astroid/tests/testdata/python3/data/nonregr.py
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-try:
-    enumerate = enumerate
-except NameError:
-
-    def enumerate(iterable):
-        """emulates the python2.3 enumerate() function"""
-        i = 0
-        for val in iterable:
-            yield i, val
-            i += 1
-
-def toto(value):
-    for k, v in value:
-        print(v.get('yo'))
-
-
-import imp
-fp, mpath, desc = imp.find_module('optparse',a)
-s_opt = imp.load_module('std_optparse', fp, mpath, desc)
-
-class OptionParser(s_opt.OptionParser):
-
-    def parse_args(self, args=None, values=None, real_optparse=False):
-        if real_optparse:
-            pass
-##          return super(OptionParser, self).parse_args()
-        else:
-            import optcomp
-            optcomp.completion(self)
-
-
-class Aaa(object):
-    """docstring"""
-    def __init__(self):
-        self.__setattr__('a','b')
-        pass
-
-    def one_public(self):
-        """docstring"""
-        pass
-
-    def another_public(self):
-        """docstring"""
-        pass
-
-class Ccc(Aaa):
-    """docstring"""
-
-    class Ddd(Aaa):
-        """docstring"""
-        pass
-
-    class Eee(Ddd):
-        """docstring"""
-        pass
diff --git a/astroid/tests/testdata/python3/data/notall.py b/astroid/tests/testdata/python3/data/notall.py
deleted file mode 100644
index 9d35aa3a..00000000
--- a/astroid/tests/testdata/python3/data/notall.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-name = 'a'
-_bla = 2
-other = 'o'
-class Aaa: pass
-
-def func(): print('yo')
-
diff --git a/astroid/tests/testdata/python3/data/notamodule/file.py b/astroid/tests/testdata/python3/data/notamodule/file.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/notamodule/file.py
+++ /dev/null
diff --git a/astroid/tests/testdata/python3/data/package/__init__.py b/astroid/tests/testdata/python3/data/package/__init__.py
deleted file mode 100644
index 575d18b1..00000000
--- a/astroid/tests/testdata/python3/data/package/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""package's __init__ file"""
-
-
-from . import subpackage
diff --git a/astroid/tests/testdata/python3/data/package/absimport.py b/astroid/tests/testdata/python3/data/package/absimport.py
deleted file mode 100644
index 33ed117c..00000000
--- a/astroid/tests/testdata/python3/data/package/absimport.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import absolute_import, print_function
-import import_package_subpackage_module # fail
-print(import_package_subpackage_module)
-
-from . import hello as hola
-
diff --git a/astroid/tests/testdata/python3/data/package/hello.py b/astroid/tests/testdata/python3/data/package/hello.py
deleted file mode 100644
index b154c844..00000000
--- a/astroid/tests/testdata/python3/data/package/hello.py
+++ /dev/null
@@ -1,2 +0,0 @@
-"""hello module"""
-
diff --git a/astroid/tests/testdata/python3/data/package/import_package_subpackage_module.py b/astroid/tests/testdata/python3/data/package/import_package_subpackage_module.py
deleted file mode 100644
index ad442c16..00000000
--- a/astroid/tests/testdata/python3/data/package/import_package_subpackage_module.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# pylint: disable-msg=I0011,C0301,W0611
-"""I found some of my scripts trigger off an AttributeError in pylint
-0.8.1 (with common 0.12.0 and astroid 0.13.1).
-
-Traceback (most recent call last):
-  File "/usr/bin/pylint", line 4, in ?
-    lint.Run(sys.argv[1:])
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 729, in __init__
-    linter.check(args)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 412, in check
-    self.check_file(filepath, modname, checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 426, in check_file
-    astroid = self._check_file(filepath, modname, checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 450, in _check_file
-    self.check_astroid_module(astroid, checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 494, in check_astroid_module
-    self.astroid_events(astroid, [checker for checker in checkers
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 511, in astroid_events
-    self.astroid_events(child, checkers, _reversed_checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 511, in astroid_events
-    self.astroid_events(child, checkers, _reversed_checkers)
-  File "/usr/lib/python2.4/site-packages/pylint/lint.py", line 508, in astroid_events
-    checker.visit(astroid)
-  File "/usr/lib/python2.4/site-packages/logilab/astroid/utils.py", line 84, in visit
-    method(node)
-  File "/usr/lib/python2.4/site-packages/pylint/checkers/variables.py", line 295, in visit_import
-    self._check_module_attrs(node, module, name_parts[1:])
-  File "/usr/lib/python2.4/site-packages/pylint/checkers/variables.py", line 357, in _check_module_attrs
-    self.add_message('E0611', args=(name, module.name),
-AttributeError: Import instance has no attribute 'name'
-
-
-You can reproduce it by:
-(1) create package structure like the following:
-
-package/
-        __init__.py
-        subpackage/
-                   __init__.py
-                   module.py
-
-(2) in package/__init__.py write:
-
-import subpackage
-
-(3) run pylint with a script importing package.subpackage.module.
-"""
-__revision__ = '$Id: import_package_subpackage_module.py,v 1.1 2005-11-10 15:59:32 syt Exp $'
-import package.subpackage.module
diff --git a/astroid/tests/testdata/python3/data/package/subpackage/__init__.py b/astroid/tests/testdata/python3/data/package/subpackage/__init__.py
deleted file mode 100644
index dc4782e6..00000000
--- a/astroid/tests/testdata/python3/data/package/subpackage/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""package.subpackage"""
diff --git a/astroid/tests/testdata/python3/data/package/subpackage/module.py b/astroid/tests/testdata/python3/data/package/subpackage/module.py
deleted file mode 100644
index 4b7244ba..00000000
--- a/astroid/tests/testdata/python3/data/package/subpackage/module.py
+++ /dev/null
@@ -1 +0,0 @@
-"""package.subpackage.module"""
diff --git a/astroid/tests/testdata/python3/data/recursion.py b/astroid/tests/testdata/python3/data/recursion.py
deleted file mode 100644
index a34dad32..00000000
--- a/astroid/tests/testdata/python3/data/recursion.py
+++ /dev/null
@@ -1,3 +0,0 @@
-""" For issue #25 """

-class Base(object):

-    pass
\ No newline at end of file
diff --git a/astroid/tests/testdata/python3/data/unicode_package/__init__.py b/astroid/tests/testdata/python3/data/unicode_package/__init__.py
deleted file mode 100644
index 713e5591..00000000
--- a/astroid/tests/testdata/python3/data/unicode_package/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-x = "șțîâ"
\ No newline at end of file
diff --git a/astroid/tests/testdata/python3/data/unicode_package/core/__init__.py b/astroid/tests/testdata/python3/data/unicode_package/core/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/astroid/tests/testdata/python3/data/unicode_package/core/__init__.py
+++ /dev/null