Repository: tinkerpop
Updated Branches:
  refs/heads/master 944ce315f -> 00949d4e9


minor nothing cleanups. ran integration tests overnight with these changes.. 
all is good. CTR.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/00949d4e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00949d4e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00949d4e

Branch: refs/heads/master
Commit: 00949d4e9510153d7f683df649e8570653b25114
Parents: 944ce31
Author: Marko A. Rodriguez <[email protected]>
Authored: Sat Oct 8 08:10:10 2016 -0600
Committer: Marko A. Rodriguez <[email protected]>
Committed: Sat Oct 8 08:10:10 2016 -0600

----------------------------------------------------------------------
 .../traversal/strategy/optimization/IdentityRemovalStrategy.java   | 2 +-
 .../traversal/strategy/optimization/InlineFilterStrategy.java      | 2 +-
 .../tinkerpop/gremlin/python/TraversalSourceGenerator.groovy       | 2 --
 gremlin-python/src/main/jython/gremlin_python/process/traversal.py | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00949d4e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategy.java
----------------------------------------------------------------------
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategy.java
index 142e525..52863f5 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IdentityRemovalStrategy.java
@@ -29,7 +29,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 /**
  * {@code IdentityRemovalStrategy} looks for {@link IdentityStep} instances 
and removes them.
  * If the identity step is labeled, its labels are added to the previous step.
- * If the identity step is labeled and its the first step, in the traversal, 
it stays.
+ * If the identity step is labeled and its the first step in the traversal, it 
stays.
  * <p/>
  *
  * @author Marko A. Rodriguez (http://markorodriguez.com)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00949d4e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index 7a4c2ae..60d024e 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -62,7 +62,7 @@ import java.util.Set;
  *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  * @example <pre>
- * __.outE().hasLabel(eq("knows").or(eq("created"))).inV()       // is 
replaced by __.outE("knows", "created)
+ * __.outE().hasLabel(eq("knows").or(eq("created"))).inV()       // is 
replaced by __.outE("knows", "created").inV()
  * __.filter(has("name","marko"))                                // is 
replaced by __.has("name","marko")
  * __.and(has("name"),has("age"))                                // is 
replaced by __.has("name").has("age")
  * __.and(filter(has("name","marko").has("age")),hasNot("blah")) // is 
replaced by __.has("name","marko").has("age").hasNot("blah")

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00949d4e/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
----------------------------------------------------------------------
diff --git 
a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
 
b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
index a12fe05..a3684cb 100644
--- 
a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
+++ 
b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
@@ -53,8 +53,6 @@ specific language governing permissions and limitations
 under the License.
 '''
 """)
-        pythonClass.append("import abc\n")
-        pythonClass.append("import six\n")
         pythonClass.append("from aenum import Enum\n")
         pythonClass.append("from .. import statics\n")
         pythonClass.append("from ..statics import long\n\n")

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00949d4e/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py 
b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index 4611541..a56dd74 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -16,8 +16,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 '''
-import abc
-import six
 from aenum import Enum
 from .. import statics
 from ..statics import long

Reply via email to