Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 32006: /trunk/ /trunk/epan/: oids.c
From: Guy Harris <[email protected]>
Date: Fri, 26 Feb 2010 20:59:14 -0800
On Feb 25, 2010, at 11:29 AM, [email protected] wrote:

> http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=32006
> 
> User: rbalint
> Date: 2010/02/25 11:29 AM
> 
> Log:
> Prevent potential crash in libsmi.
> From: Vincent Bernat <[email protected]>
> 
> Directory: /trunk/epan/
>  Changes    Path          Action
>  +12 -0     oids.c        Modified
> 
> Directory: /trunk/tools/
>  Changes    Path          Action
>  +2 -2      asn2wrs.py    Modified

Was the asn2wrs.py change:

Index: asn2wrs.py
===================================================================
--- asn2wrs.py  (revision 31777)
+++ asn2wrs.py  (revision 32006)
@@ -47,8 +47,8 @@
 import getopt
 import traceback
 
-import lex
-import yacc
+from ply import lex
+from ply import yacc
 
 # OID name -> number conversion table
 oid_names = {

part of Vincent's change, or was it something else?

Before the change, asn2wrs worked on OS X without having to install ply; it now complains:

Traceback (most recent call last):
  File "../../tools/asn2wrs.py", line 50, in <module>
    from ply import lex
ImportError: No module named ply