Changeset 188

Timestamp:

12/31/06 00:53:56 (2 years ago)

Author:

akhavr

Message:

ticket:371:

• implemented Import and ImportFrom?
  

Files:

• pybeast/trunk/ctest (modified) (1 prop)
• pybeast/trunk/ctest/Makefile (modified) (2 diffs)
• pybeast/trunk/ctest/cov (added)
• pybeast/trunk/ctest/py2py.py (added)
• pybeast/trunk/dtest/Makefile (modified) (2 diffs)
• pybeast/trunk/dtest/py2py.py (modified) (3 diffs)
• pybeast/trunk/src/py2py.py (modified) (6 diffs)

pybeast/trunk/ctest/Makefile

@@ -7 +7 @@
-test_results=$(test_scripts:.py=.pass)
-
-:../src
+
-
-# Targets
-
-build test clean
+pylint build test clean coverage
-
-
+
+
+
+
+
+
+
+
-
-build:
-
+
+
+
+
+
-
-clean:
@@ -25 +36 @@
-%.pass :: %.py $(srcs)
-        -rm $@
-
-
-
+
-
-# Deps

pybeast/trunk/dtest/Makefile

@@ -26 +26 @@
-
-clean_coverage:
-
+-
-        ./cov -e
-
@@ -38 +38 @@
-        PYTHONPATH=$(pythonpath) ./cov -x -p $< && touch $@
-
-# todo add coverage.py support
-
-# Deps
-

pybeast/trunk/dtest/py2py.py

@@ -17 +17 @@
-class NeedSpace(unittest.TestCase):
-    'Test need_space before current op function'
+
+    def test_no_code(self):
+        'Test when first letter to be emmitted'
+        self.failUnless(not Styler().need_space(['Stmt', 'Mul', 'Add'], ''),
+                        'Trying to put a space as a first code symbol')
-    
-    def test_unary(self):
@@ -85 +90 @@
-        formatter = Pep8Formatter()
-        walk(ast, formatter)
-
+
+
+
+
-        self.failUnless(formatter.dump()==expr,
-                        msg % (expr, ast, formatter.dump()))
@@ -389 +397 @@
-        'Test unicode string'
-        self.reformat_and_test('a = u\'string\'')
+
+
+class Import(Expr):
+    'Test import'
+
+    def test_simple(self):
+        'simple import'
+        self.reformat_and_test('import compiler\n')
+
+    def test_import_as(self):
+        'import as'
+        self.reformat_and_test('import compiler as c\n')
+
+    def test_import_from(self):
+        'from xyz import abc'
+        self.reformat_and_test('from unittest import TestCase')
+
+    def test_import_from_as(self):
+        'from xyz import abc as a'
+        self.reformat_and_test('from unittest import TestCase as tc')
-        
-    

pybeast/trunk/src/py2py.py

@@ -36 +36 @@
-    def need_space(self, op_stack, code):
-        'Determines if we need to put a space before a current op'
+        if len(code)==0:
+            return False
+        
-        if len(op_stack)<2:
-            return True
@@ -89 +92 @@
-
-        need_parens_now = self.style.need_parens(self.expr_ops_stack)
+        if self.style.need_space(self.expr_ops_stack, self.code):
+            self.code += ' '
-        if need_parens_now:
- 
+
-            
-        walker.dispatch(node.left)
@@ -232 +237 @@
-                walker.dispatch(ifs)
-
+    def visit_from(self, node, walker):
+        'visit From node (from xyz import abc)'
+        self.code += 'from %s import' % node.modname
+        for name in node.names:
+            self.code += ' %s' % name[0]
+            if name[1]:
+                self.code += ' as %s' % name[1]
+            self.code += ','
+        self.code = self.code[:-1]
+
+    def visit_import(self, node, walker):
+        'visit Import node'
+        self.code += 'import '
+        for name in node.names:
+            self.code += name[0]
+            if name[1]:
+                self.code += ' as %s' % name[1]
+            self.code += ', '
+        self.code = self.code[:-2]
+
-    def visit_keyword(self, node, walker):
-        'visit Keyword node'
@@ -251 +276 @@
-        defaults.reverse()
-
-
+
+
+
-
-        prefix = ''
@@ -301 +328 @@
-        self.code += str(node.name)
-
+    def visit_stmt(self, node, walker):
+        'visit Stmt node'
+        for stmt_node in node.nodes:
+            walker.dispatch(stmt_node)
+            self.code += '\n'
+
-    def visit_subscript(self, node, walker):
-        'visit Subsvript node'
@@ -316 +349 @@
-    def dump(self):
-        'Return accumulated source code'
-.strip()
+
-
-    def map_operation(self, name, default):